diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 3893531b4..6fe22ff85 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -548,6 +548,12 @@
 				$database->execute($sql, $parameters);
 				unset($sql, $parameters);
 
+				// Unset remember me cookie
+				if ($user_uuid == $_SESSION['user_uuid']) {
+					unset($_COOKIE['remember']);
+					setcookie('remember', '', time() - 3600, '/');
+				}
+
 				//send the password changed email
 				if (valid_email($user_email)) {
 					//generate email and body variables