diff --git a/guacamole/src/main/webapp/scripts/admin-ui.js b/guacamole/src/main/webapp/scripts/admin-ui.js
index f14863ddb..f511761dd 100644
--- a/guacamole/src/main/webapp/scripts/admin-ui.js
+++ b/guacamole/src/main/webapp/scripts/admin-ui.js
@@ -755,20 +755,20 @@ GuacAdmin.reset = function() {
     }
 
     /*
-     * Add readable users.
+     * Add readable users and connections.
      */
 
+    var i;
+
     GuacAdmin.lists.user_list.innerHTML = "";
-    for (var name in GuacAdmin.cached_permissions.read_user)
-        GuacAdmin.addUser(name)
-
-    /*
-     * Add readable connections.
-     */
+    var readable_users = Object.keys(GuacAdmin.cached_permissions.read_user).sort();
+    for (i=0; i<readable_users.length; i++)
+        GuacAdmin.addUser(readable_users[i])
 
     GuacAdmin.lists.connection_list.innerHTML = "";
-    for (var i=0; i<GuacAdmin.cached_connections.length; i++)
-        GuacAdmin.addConnection(GuacAdmin.cached_connections[i]);
+    var readable_connections = Object.keys(GuacAdmin.cached_permissions.read_connection).sort();
+    for (i=0; i<readable_connections.length; i++)
+        GuacAdmin.addConnection(readable_connections[i]);
 
 };