diff --git a/app/modules/invite-members/lightbox-add-members.jade b/app/modules/invite-members/lightbox-add-members.jade
index c88bebdb..329c1d4e 100644
--- a/app/modules/invite-members/lightbox-add-members.jade
+++ b/app/modules/invite-members/lightbox-add-members.jade
@@ -4,6 +4,7 @@ tg-lightbox-close
     tg-suggest-add-members(
         ng-show="!vm.displayContactList"
         contacts="vm.contacts"
+        filtered-contacts="vm.contacts.slice(0,12)"
         on-invite-suggested="vm.inviteSuggested(contact)"
         on-invite-email="vm.inviteEmail(email)"
     )
diff --git a/app/modules/invite-members/suggest-add-members/suggest-add-members.controller.coffee b/app/modules/invite-members/suggest-add-members/suggest-add-members.controller.coffee
index 03bde373..5c070780 100644
--- a/app/modules/invite-members/suggest-add-members/suggest-add-members.controller.coffee
+++ b/app/modules/invite-members/suggest-add-members/suggest-add-members.controller.coffee
@@ -31,7 +31,7 @@ class SuggestAddMembersController
     filterContacts: () ->
         @.filteredContacts = @.contacts.filter( (contact) =>
             contact.get('full_name_display').toLowerCase().includes(@.contactQuery.toLowerCase()) || contact.get('username').toLowerCase().includes(@.contactQuery.toLowerCase());
-        )
+        ).slice(0,12)
 
     setInvited: (contact) ->
         @.onInviteSuggested({'contact': contact})
diff --git a/app/modules/invite-members/suggest-add-members/suggest-add-members.directive.coffee b/app/modules/invite-members/suggest-add-members/suggest-add-members.directive.coffee
index 0bd4f661..f7f27201 100644
--- a/app/modules/invite-members/suggest-add-members/suggest-add-members.directive.coffee
+++ b/app/modules/invite-members/suggest-add-members/suggest-add-members.directive.coffee
@@ -18,6 +18,7 @@
 ###
 
 SuggestAddMembersDirective = (lightboxService) ->
+
     return {
         scope: {},
         templateUrl:"invite-members/suggest-add-members/suggest-add-members.html",
@@ -25,7 +26,7 @@ SuggestAddMembersDirective = (lightboxService) ->
         controllerAs: "vm",
         bindToController: {
             contacts: '=',
-            filteredContacts: '<contacts',
+            filteredContacts: '<',
             onInviteSuggested: '&',
             onInviteEmail: '&'
         }
diff --git a/app/modules/invite-members/suggest-add-members/suggest-add-members.jade b/app/modules/invite-members/suggest-add-members/suggest-add-members.jade
index 130e5425..af229f1c 100644
--- a/app/modules/invite-members/suggest-add-members/suggest-add-members.jade
+++ b/app/modules/invite-members/suggest-add-members/suggest-add-members.jade
@@ -21,11 +21,11 @@
 
     ul.add-member-suggest-list
         li.add-member-suggest-single.e2e-add-member-suggest-single(
-            ng-repeat="contact in vm.filteredContacts | toMutable | limitTo: 12 | orderBy:'full_name_display'"
+            tg-repeat="contact in vm.filteredContacts"
             ng-click="vm.setInvited(contact)"
         )
             img.add-member-suggest-avatar(
                 tg-avatar="contact"
-                alt="{{contact.full_name_display}}"
+                alt="{{contact.get('full_name_display')}}"
             )
-            span.add-member-suggest-name {{contact.full_name_display}}
+            span.add-member-suggest-name {{contact.get('full_name_display')}}