diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee
index 38bc07bd..6090a4e0 100644
--- a/app/coffee/modules/admin/lightboxes.coffee
+++ b/app/coffee/modules/admin/lightboxes.coffee
@@ -71,6 +71,7 @@ CreateMembersDirective = ($rs, $rootScope, $confirm) ->
             fieldSet = target.parent()
 
             fieldSet.remove()
+            $el.find('.add-fieldset').show()
 
         $el.on "click", ".add-fieldset", (event) ->
             event.preventDefault()
@@ -81,6 +82,9 @@ CreateMembersDirective = ($rs, $rootScope, $confirm) ->
             newFieldSet = createFieldSet()
             fieldSet.after(newFieldSet)
 
+            if $el.find('fieldset').length == 6
+                $el.find('.add-fieldset').hide()
+
         $el.on "click", ".button-green", (event) ->
             event.preventDefault()