diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index b797fcf91853d72aca7ab7e24ded9d0469a77410..822a95c1bc2e01c4a94b3415280e6ed49c332784 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -19,10 +19,14 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
 if(OC_User::getUser() === $username) {
-	if (OC_User::checkPassword($username, $oldPassword) && ($userstatus === null || !OC_JSON::isUserVerified()))
+	if (OC_User::checkPassword($username, $oldPassword))
 	{
 		$userstatus = 'user';
-	} 
+	}  else {
+		if (!OC_JSON::isUserVerified()) {
+			$userstatus = null;
+		}
+	}
 }
 
 if(is_null($userstatus)) {