Reverted fix temporarily; another fix by LukasReschke is awaiting merge

settings/ajax/changepassword.php

@@ -22,9 +22,11 @@ if(OC_User::getUser() === $username) {
 	if (OC_User::checkPassword($username, $oldPassword)) {
 		$userstatus = 'user';
 	}  else {
+		if (!OC_Util::isUserVerified()) {
 			$userstatus = null;
 		}
 	}
+}
 
 if(is_null($userstatus)) {
 	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));