diff --git a/app/coffee/modules/controllerMixins.coffee b/app/coffee/modules/controllerMixins.coffee
index 2af688a5..ee02dc8a 100644
--- a/app/coffee/modules/controllerMixins.coffee
+++ b/app/coffee/modules/controllerMixins.coffee
@@ -19,6 +19,11 @@
 # File: modules/controllerMixins.coffee
 ###
 
+taiga = @.taiga
+
+groupBy = @.taiga.groupBy
+
+
 class PageMixin
     loadUsersAndRoles: ->
         promise = @q.all([
@@ -29,16 +34,15 @@ class PageMixin
         return promise.then (results) =>
             [users, roles] = results
 
-            @scope.users = _.sortBy(users, "id")
-            @scope.roles = roles
-
-            @scope.usersById = {}
-            _.each(users, (x) => @scope.usersById[x.id] = x)
+            @scope.users = _.sortBy(users, "full_name_display")
+            @scope.usersById = groupBy(@scope.users, (e) -> e.id)
 
+            @scope.roles = _.sortBy(roles, "order")
             availableRoles = _(@scope.project.memberships).map("role").uniq().value()
             @scope.computableRoles = _(roles).filter("computable")
                                              .filter((x) -> _.contains(availableRoles, x.id))
                                              .value()
+
             return results