diff --git a/docbow_project/docbow/forms.py b/docbow_project/docbow/forms.py
index ecc98c3..4299a33 100644
--- a/docbow_project/docbow/forms.py
+++ b/docbow_project/docbow/forms.py
@@ -40,8 +40,9 @@ class RecipientForm(object):
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user', None)
         self.user = user
-        user_qs = kwargs.pop('user_qs', User.objects.filter())
-        user_qs = non_guest_users().filter(is_active=True)
+        user_qs = kwargs.pop('user_qs', None)
+        if user_qs is None:
+            user_qs = non_guest_users().filter(is_active=True)
         list_qs = kwargs.pop('list_qs', MailingList.objects.active())
         super(RecipientForm, self).__init__(*args, **kwargs)
         self.fields['recipients'].user = user