diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index c857e7dd5..433ae1230 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -876,39 +876,26 @@ class DomainAddUserView(DomainFormBaseView):
             DomainInvitation.objects.get_or_create(email=email_address, domain=self.object)
         return redirect(self.get_success_url())
 
-    def _create_user_domain_role(self, requested_user, requested_email, domain, role):
-        """Assign a user to a domain as a specified role"""
-        try:
-            UserDomainRole.objects.create(
-                user=requested_user,
-                domain=self.object,
-                role=UserDomainRole.Roles.MANAGER,
-            )
-            messages.success(self.request, f"Added user {requested_email}.")
-        except IntegrityError:
-            messages.warning(self.request, f"{requested_email} is already a manager for this domain")
-
     def form_valid(self, form):
         """Add the specified user on this domain.
         Throws EmailSendingError."""
         requested_email = form.cleaned_data["email"]
         requestor = self.request.user
+        email_success = False
         # look up a user with that email
         try:
             requested_user = User.objects.get(email=requested_email)
         except User.DoesNotExist:
             # no matching user, go make an invitation
-            requested_user = self._make_invitation(requested_email, requestor)
-            self._create_user_domain_role(requested_user, requested_email, self.object, UserDomainRole.Roles.MANAGER)
+            email_success = True
+            return self._make_invitation(requested_email, requestor)
         else:
             # if user already exists then just send an email
             try:
                 self._send_domain_invitation_email(
                     requested_email, requestor, requested_user=requested_user, add_success=False
                 )
-                self._create_user_domain_role(
-                    requested_user, requested_email, self.object, UserDomainRole.Roles.MANAGER
-                )
+                email_success = True
             except EmailSendingError:
                 logger.warn(
                     "Could not send email invitation (EmailSendingError)",
@@ -933,6 +920,17 @@ class DomainAddUserView(DomainFormBaseView):
                     exc_info=True,
                 )
                 messages.warning(self.request, "Could not send email invitation.")
+        if email_success:
+            try:
+                UserDomainRole.objects.create(
+                    user=requested_user,
+                    domain=self.object,
+                    role=UserDomainRole.Roles.MANAGER,
+                )
+                messages.success(self.request, f"Added user {requested_email}.")
+            except IntegrityError:
+                messages.warning(self.request, f"{requested_email} is already a manager for this domain")
+
         return redirect(self.get_success_url())