diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 90553ff..8eac092 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -1361,8 +1361,8 @@ define(function(require){
 			var self = this;
 
 			self.groupsListUsers(function(dataUsers) {
-				dataUsers.sort(function(a, b) {
-					return a.first_name > b.first_name ? 1 : -1;
+				dataUsers.sort(function(a,b) {
+					return monster.util.cmp(a.first_name.toLowerCase(), b.first_name.toLowerCase()) || monster.util.cmp(a.last_name.toLowerCase(), b.last_name.toLowerCase());
 				});
 
 				var dataTemplate = {
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 273f674..d6cf98b 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -413,6 +413,10 @@ define(function(require){
 				sortedUsers.push(user);
 			});
 
+			sortedUsers.sort(function(a,b) {
+				return monster.util.cmp(a.first_name.toLowerCase(), b.first_name.toLowerCase()) || monster.util.cmp(a.last_name.toLowerCase(), b.last_name.toLowerCase());
+			});
+
 			dataTemplate.users = sortedUsers;
 
 			return dataTemplate;