diff --git a/pkg/user/user_password_reset.go b/pkg/user/user_password_reset.go
index 6d0f0c26..ed68c16a 100644
--- a/pkg/user/user_password_reset.go
+++ b/pkg/user/user_password_reset.go
@@ -63,7 +63,9 @@ func ResetPassword(s *xorm.Session, reset *PasswordReset) (err error) {
 	}
 
 	// Save it
+	user.PasswordResetToken = ""
 	_, err = s.
+		Cols("password", "password_reset_token").
 		Where("id = ?", user.ID).
 		Update(&user)
 	if err != nil {