summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--settings/ajax/changepassword.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index b797fcf9185..822a95c1bc2 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)) {