diff --git a/Bonobo.Git.Server/Controllers/RepositoryController.cs b/Bonobo.Git.Server/Controllers/RepositoryController.cs
index 81c4c61a0..352ea9b1a 100644
--- a/Bonobo.Git.Server/Controllers/RepositoryController.cs
+++ b/Bonobo.Git.Server/Controllers/RepositoryController.cs
@@ -630,9 +630,9 @@ public ActionResult History(Guid id, string encodedPath, string encodedName)
         private void PopulateCheckboxListData(ref RepositoryDetailModel model)
         {
             model = model.Id != Guid.Empty ? ConvertRepositoryModel(RepositoryRepository.GetRepository(model.Id), User) : model;
-            model.AllAdministrators = MembershipService.GetAllUsers().ToArray();
-            model.AllUsers = MembershipService.GetAllUsers().ToArray();
-            model.AllTeams = TeamRepository.GetAllTeams().ToArray();
+            model.AllAdministrators = MembershipService.GetAllUsers().OrderBy(u => u.DisplayName).ToArray();
+            model.AllUsers = MembershipService.GetAllUsers().OrderBy(u => u.DisplayName).ToArray();
+            model.AllTeams = TeamRepository.GetAllTeams().OrderBy(g => g.DisplayName).ToArray();
             if (model.PostedSelectedUsers != null && model.PostedSelectedUsers.Any())
             {
                 model.Users = model.PostedSelectedUsers.Select(x => MembershipService.GetUserModel(x)).ToArray();