diff --git a/index.php b/index.php
index 4e1f5bcc8d6..6805e3a914d 100644
--- a/index.php
+++ b/index.php
@@ -88,7 +88,7 @@ else {
 				if(defined("DEBUG") && DEBUG) {
 					error_log("Setting remember login to cookie");
 				}
-				$token = md5($_POST["user"].time());
+				$token = md5($_POST["user"].time().$_POST['password']);
 				OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
 				OC_User::setMagicInCookie($_POST["user"], $token);
 			}