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