diff --git a/app/coffee/modules/resources/memberships.coffee b/app/coffee/modules/resources/memberships.coffee
index 6a2763b7..09443fd7 100644
--- a/app/coffee/modules/resources/memberships.coffee
+++ b/app/coffee/modules/resources/memberships.coffee
@@ -28,10 +28,13 @@ resourceProvider = ($repo, $http, $urls) ->
     service.get = (id) ->
         return $repo.queryOne("memberships", id)
 
-    service.list = (projectId, filters) ->
+    service.list = (projectId, filters, enablePagination=true) ->
         params = {project: projectId}
         params = _.extend({}, params, filters or {})
-        return $repo.queryPaginated("memberships", params)
+        if enablePagination
+            return $repo.queryPaginated("memberships", params)
+
+        return $repo.queryMany("memberships", params, options={enablePagination:enablePagination})
 
     service.listByUser = (userId, filters) ->
         params = {user: userId}
diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index a8370063..c69e3714 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -48,6 +48,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
 
         # On Success
         promise.then =>
+            #TODO: i18n
             @appTitle.set("Team - " + @scope.project.name)
             tgLoader.pageLoaded()
 
@@ -63,8 +64,8 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
             @scope.filtersRole = ""
 
     loadMembers: ->
-        return @rs.memberships.list(@scope.projectId).then (data) =>
-            @scope.memberships = data.models
+        return @rs.memberships.list(@scope.projectId, {}, false).then (data) =>
+            @scope.memberships = _.filter(data, (membership) => membership.user?)
             return data
 
     loadProject: ->