diff --git a/user/edit.php b/user/edit.php
index 505d32aeb39..f4365de4c5e 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -208,8 +208,9 @@ function find_form_errors(&$user, &$usernew, &$err) {
         if (empty($usernew->newpassword) and empty($user->password))
             $err["newpassword"] = get_string("missingpassword");
 
-        if ($usernew->newpassword == md5("admin") or $user->password == md5("admin"))
+        if (($usernew->newpassword == "admin") or ($user->password == md5("admin") and empty($usernew->newpassword)) ) {
             $err["newpassword"] = get_string("unsafepassword");
+        }
     }
 
     if (empty($usernew->email))