common/user-list.c | 4 ++--
 data/users.conf    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/user-list.c b/common/user-list.c
index b3d6d9ef..a5decb20 100644
--- a/common/user-list.c
+++ b/common/user-list.c
@@ -338,12 +338,12 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal)
 
     g_autofree gchar *hidden_users_list = g_key_file_get_string (config, "UserList", "hidden-users", NULL);
     if (!hidden_users_list)
-        hidden_users_list = g_strdup ("nobody nobody4 noaccess");
+        hidden_users_list = g_strdup ("nobody uucp");
     g_auto(GStrv) hidden_users = g_strsplit (hidden_users_list, " ", -1);
 
     g_autofree gchar *hidden_shells_list = g_key_file_get_string (config, "UserList", "hidden-shells", NULL);
     if (!hidden_shells_list)
-        hidden_shells_list = g_strdup ("/bin/false /usr/sbin/nologin");
+        hidden_shells_list = g_strdup ("/bin/false /bin/nologin /dev/null");
     g_auto(GStrv) hidden_shells = g_strsplit (hidden_shells_list, " ", -1);
 
     setpwent ();
diff --git a/data/users.conf b/data/users.conf
index 5c019931..ff6bff4f 100644
--- a/data/users.conf
+++ b/data/users.conf
@@ -10,5 +10,5 @@
 #
 [UserList]
 minimum-uid=500
-hidden-users=nobody nobody4 noaccess
-hidden-shells=/bin/false /usr/sbin/nologin /sbin/nologin
+hidden-users=nobody
+hidden-shells=/bin/false /sbin/nologin /dev/null