[User accounts] New user email with pwd generation fix

aces · Jun 30, 2020 · 756255f · 756255f
1 parent 178e8d8
commit 756255f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/modules/user_accounts/php/edit_user.class.inc b/modules/user_accounts/php/edit_user.class.inc
@@ -1104,7 +1104,11 @@ class Edit_User extends \NDB_Form
         }
 
         // Make sure the user is not using their username as their password.
-        if ((isset($values['UserID'])
+        // case 1 - New user and Make user name match email address not checked
+        // case 2 - New user and Make user name match email address checked
+        //          already handled in email/password check
+        // case 3 - Edit user
+        if ((isset($values['UserID']) && !isset($values['NA_UserID'])
             && $values['UserID'] === $values['Password_hash'])
             || (!empty($this->identifier)
             && $this->identifier === $values['Password_hash'])