diff --git a/app/modules/services/user-list.service.coffee b/app/modules/services/user-list.service.coffee
index 0e3f0afb..7eeab7b4 100644
--- a/app/modules/services/user-list.service.coffee
+++ b/app/modules/services/user-list.service.coffee
@@ -27,7 +27,6 @@ class UserListService
     ]
 
     constructor: (@currentUserService, @projectService) ->
-        @.currentUser = @currentUserService.getUser()?.toJS()
 
     filterUsers: (text, user) ->
         username = user.full_name_display.toUpperCase()
@@ -37,9 +36,10 @@ class UserListService
         return _.includes(username, text)
 
     searchUsers: (text, excludedUser) ->
+        @.currentUser = @currentUserService.getUser()
         users = _.clone(@projectService.activeMembers.toJS(), true)
         users = _.reject(users, {"id": excludedUser.id}) if excludedUser
-        users = _.sortBy(users, (o) => if o.id is @.currentUser.id then 0 else o.id)
+        users = _.sortBy(users, (o) => if o.id is @.currentUser?.get('id') then 0 else o.id)
         users = _.filter(users, _.partial(@.filterUsers, text)) if text?
         return users