diff --git a/user/edit.php b/user/edit.php
index 2180a69fd54..d6bfde3ada2 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -79,9 +79,9 @@
             check_for_restricted_user($USER->username, "$CFG->wwwroot/course/view.php?id=$course->id");
         }
 
-        if (isset($usernew->password)) {
-            unset($usernew->password);
-        }
+        unset($usernew->password);
+        unset($usernew->admin);
+        unset($usernew->newadminuser);
 
         // data cleanup 
         // username is validated in find_form_errors