diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index 960fc50550e7c58b6ab7c95d593266b05fee19f7..8932f48d8baac0e0d220e8f17e5857c009a2a473 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -440,6 +440,8 @@ class Admin_UserController extends AuthenticatedController
             if (
                 $GLOBALS['perm']->have_perm('root')
                 && Config::get()->ALLOW_ADMIN_USERACCESS
+                && !StudipAuthAbstract::CheckField('auth_user_md5.password', $this->user->auth_plugin)
+                && $this->user->auth_plugin !== null
                 && (Request::get('pass_1') !== '' || Request::get('pass_2') !== '')
             ) {
                 if (Request::get('pass_1') === Request::get('pass_2')) {