diff --git a/src/Auth.php b/src/Auth.php
index ac2be1b..e1a373d 100644
--- a/src/Auth.php
+++ b/src/Auth.php
@@ -626,6 +626,9 @@ class Auth {
 				if (password_verify($oldPassword, $passwordInDatabase)) {
 					// update the password in the database
 					$this->updatePassword($userId, $newPassword);
+
+					// delete any remaining remember directives
+					$this->deleteRememberDirective($userId);
 				}
 				else {
 					throw new InvalidPasswordException();
@@ -848,6 +851,9 @@ class Auth {
 					// update the password in the database
 					$this->updatePassword($resetData['user'], $newPassword);
 
+					// delete any remaining remember directives
+					$this->deleteRememberDirective($resetData['user']);
+
 					try {
 						$this->db->delete(
 							'users_resets',