diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index e0d9fb9874..45c2510f12 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -371,7 +371,7 @@ class UsersController extends AdminController
 
 
             // Do we have permission to delete this user?
-            if ($user->isSuperUser() and ! Sentry::getUser()->isSuperUser()) {
+            if ((!Sentry::getUser()->isSuperUser()) || (Config::get('app.lock_passwords'))) {
                 // Redirect to the user management page
                 return Redirect::route('users')->with('error', 'Insufficient permissions!');
             }