diff --git a/guacamole/src/main/webapp/app/manage/directives/dataSourceTabs.js b/guacamole/src/main/webapp/app/manage/directives/dataSourceTabs.js
index cf7068f27..627197bf4 100644
--- a/guacamole/src/main/webapp/app/manage/directives/dataSourceTabs.js
+++ b/guacamole/src/main/webapp/app/manage/directives/dataSourceTabs.js
@@ -76,9 +76,12 @@ angular.module('manage').directive('dataSourceTabs', ['$injector',
         $scope.$watch('permissions', function permissionsChanged(permissions) {
 
             $scope.pages = [];
-            angular.forEach(permissions, function addDataSourcePage(managementPermissions, dataSource) {
+
+            var dataSources = _.keys($scope.permissions).sort();
+            angular.forEach(dataSources, function addDataSourcePage(dataSource) {
 
                 // Determine whether data source contains this object
+                var managementPermissions = permissions[dataSource];
                 var exists = !!managementPermissions.identifier;
 
                 // Data source is not relevant if the associated object does not
diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUserGroups.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUserGroups.js
index 5d45bc141..a8f2dd37c 100644
--- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUserGroups.js
+++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUserGroups.js
@@ -119,9 +119,11 @@ angular.module('settings').directive('guacSettingsUserGroups', ['$injector',
                 return null;
 
             // For each data source
-            for (var dataSource in permissions) {
+            var dataSources = _.keys(permissions).sort();
+            for (var i = 0; i < dataSources.length; i++) {
 
                 // Retrieve corresponding permission set
+                var dataSource = dataSources[i];
                 var permissionSet = permissions[dataSource];
 
                 // Can create user groups if adminstrator or have explicit permission
diff --git a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
index 870a86256..4adf04eb8 100644
--- a/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
+++ b/guacamole/src/main/webapp/app/settings/directives/guacSettingsUsers.js
@@ -150,9 +150,11 @@ angular.module('settings').directive('guacSettingsUsers', [function guacSettings
                     return null;
 
                 // For each data source
-                for (var dataSource in $scope.permissions) {
+                var dataSources = _.keys($scope.permissions).sort();
+                for (var i = 0; i < dataSources.length; i++) {
 
                     // Retrieve corresponding permission set
+                    var dataSource = dataSources[i];
                     var permissionSet = $scope.permissions[dataSource];
 
                     // Can create users if adminstrator or have explicit permission