diff --git a/guacamole/src/main/webapp/scripts/root-ui.js b/guacamole/src/main/webapp/scripts/root-ui.js
index 84fa12317..80605ec70 100644
--- a/guacamole/src/main/webapp/scripts/root-ui.js
+++ b/guacamole/src/main/webapp/scripts/root-ui.js
@@ -145,9 +145,6 @@ GuacamoleRootUI.reset = function() {
     try {
         connections = GuacamoleService.Connections.list(parameters);
 
-        // Sort connections by ID
-        connections.sort(GuacamoleService.Connections.comparator);
-
         // Show admin elements if admin permissions available
         var permissions = GuacamoleService.Permissions.list();
         if (permissions.administer
diff --git a/guacamole/src/main/webapp/scripts/service.js b/guacamole/src/main/webapp/scripts/service.js
index 34daaaab7..0671bc80d 100644
--- a/guacamole/src/main/webapp/scripts/service.js
+++ b/guacamole/src/main/webapp/scripts/service.js
@@ -316,6 +316,9 @@ GuacamoleService.Connections = {
             
         }
 
+        // Sort connections by ID
+        connections.sort(GuacamoleService.Connections.comparator);
+
         return connections;
  
     },
@@ -448,6 +451,9 @@ GuacamoleService.Users = {
         for (var i=0; i<userElements.length; i++)
             users.push(userElements[i].getAttribute("name"));
 
+        // Sort by username
+        users.sort();
+
         return users;
      
     },