diff --git a/lib/group.php b/lib/group.php
index 1e0216a932..91772d510f 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -233,6 +233,7 @@ class OC_Group {
 
 			$groups=array_merge($backend->getUserGroups($uid),$groups);
 		}
+		asort($groups);
 		return $groups;
 	}
 
@@ -250,6 +251,7 @@ class OC_Group {
 
 			$groups=array_merge($backend->getGroups(),$groups);
 		}
+		asort($groups);
 		return $groups;
 	}
 	
diff --git a/lib/user.php b/lib/user.php
index 056d130754..a62b0f9683 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -336,6 +336,7 @@ class OC_User {
 				}
 			}
 		}
+		asort($users);
 		return $users;
 	}