diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index f5213a78b..767d47f36 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -350,8 +350,10 @@ function userHasPrivilege($userent, $privid = false)
     return true;
 }
 
-function userIsAdmin($username) {
+function userIsAdmin($username)
+{
     $user = getUserEntry($username);
+
     return userHasPrivilege($user, 'page-all');
 }
 
@@ -485,7 +487,7 @@ function local_user_set(&$user, $force_password = false)
     }
 
     /* admins access gives wheely rights */
-    if (userHasPrivilege($user, 'page-all')) {
+    if (userIsAdmin($user['name'])) {
         $user_group = 'wheel';
     }
 
diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index b369b77ff..8f3a730e3 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -998,7 +998,7 @@ $( document ).ready(function() {
 <?php
                         if (isset($userent['disabled'])) {
                             $usrimg = 'text-muted';
-                        } elseif (userHasPrivilege($userent, 'page-all')) {
+                        } elseif (userIsAdmin($userent['name'])) {
                             $usrimg = 'text-danger';
                         } else {
                             $usrimg = 'text-info';