diff --git a/src/rockstor/storageadmin/views/user.py b/src/rockstor/storageadmin/views/user.py
index 64690b874..5fbc47d82 100644
--- a/src/rockstor/storageadmin/views/user.py
+++ b/src/rockstor/storageadmin/views/user.py
@@ -38,28 +38,45 @@
 
 class UserMixin(object):
     serializer_class = SUserSerializer
+    # List based on subsection "Default system users":
+    # https://doc.opensuse.org/documentation/leap/startup/html/book-startup/cha-yast-userman.html
     exclude_list = (
-        "root",
-        "nobody",
+        "at",
+        "avahi",
         "bin",
+        "chrony",
         "daemon",
-        "adm",
-        "sync",
-        "shutdown",
-        "halt",
+        "dockremap",
+        "gdm",
+        "lp",
         "mail",
-        "operator",
-        "dbus",
-        "rpc",
-        "avahi",
-        "avahi-autoipd",
-        "rpcuser",
-        "nfsnobody",
-        "postgres",
-        "ntp",
+        "man",
+        "messagebus",
         "nginx",
+        "nobody",
+        "nscd",
+        "ntp",
+        "pesign",
+        "polkitd",
         "postfix",
+        "postgres",
+        "pulse",
+        "rockstor",
+        "root",
+        "rpc",
+        "rtkit",
+        "salt",
+        "scard",
+        "shellinabox",
+        "srvGeoClue",
         "sshd",
+        "statd",
+        "systemd-coredump",
+        "systemd-network",
+        "systemd-timesync",
+        "tftp",
+        "unbound",
+        "upsd",
     )
 
     @classmethod