diff --git a/tabbycat/users/forms.py b/tabbycat/users/forms.py
index 1d6809c8a81..b5274b83575 100644
--- a/tabbycat/users/forms.py
+++ b/tabbycat/users/forms.py
@@ -34,7 +34,8 @@ def get_users(self, email):
                 'username': email.split("@")[0],
             },
         )
-        user.membership_set.create(group=self.cleaned_data['role'])
+        if created:
+            user.membership_set.add(group=self.cleaned_data['role'])
         return [user]
 
     def save(self, *args, **kwargs):
diff --git a/tabbycat/users/templates/invite_user.html b/tabbycat/users/templates/invite_user.html
index 659f15f7844..80307aeed9e 100644
--- a/tabbycat/users/templates/invite_user.html
+++ b/tabbycat/users/templates/invite_user.html
@@ -18,6 +18,7 @@
     {% include 'components/form-main.html' %}
 
     {% trans "Invite User" context "button" as title %}
+    {% trans "Note: if you submit this multiple times, multiple invite emails will be sent." as subtitle %}
     {% include "components/form-submit.html" %}
   </div>
 </form>