diff --git a/include/class.auth.php b/include/class.auth.php
index e7b299a988743d945733a03fe2438bebbe144077..660acf9ba2aba5946acd40fd2ec07bedea154237 100644
--- a/include/class.auth.php
+++ b/include/class.auth.php
@@ -322,8 +322,6 @@ abstract class StaffAuthenticationBackend  extends AuthenticationBackend {
 
         Signal::send('auth.login.succeeded', $staff);
 
-        $staff->cancelResetTokens();
-
         return true;
     }
 
diff --git a/scp/pwreset.php b/scp/pwreset.php
index 735765b05b0e780cfe7e0f704d72f748f2466ee8..b2826014c9b46b27572d3de6f3c6801c89183a6d 100644
--- a/scp/pwreset.php
+++ b/scp/pwreset.php
@@ -53,8 +53,7 @@ if($_POST) {
             $errors = array();
             if ($staff = StaffAuthenticationBackend::processSignOn($errors)) {
                 $info = array('page' => 'index.php');
-                header('Location: '.$info['page']);
-                exit();
+                Http::redirect($info['page']);
             }
             elseif (isset($errors['msg'])) {
                 $msg = $errors['msg'];