diff --git a/src/registrar/templates/dashboard_base.html b/src/registrar/templates/dashboard_base.html
index 27b5ea717..46b04570b 100644
--- a/src/registrar/templates/dashboard_base.html
+++ b/src/registrar/templates/dashboard_base.html
@@ -3,22 +3,22 @@
 {% block wrapper %}
 
   <div id="wrapper" class="dashboard">
-    {% block messages %}
-    {% if messages %}
-    <ul class="messages">
-      {% for message in messages %}
-      <li{% if message.tags %} class="{{ message.tags }}" {% endif %}>
-        {{ message }}
-        </li>
-        {% endfor %}
-    </ul>
-    {% endif %}
-    {% endblock %}
-
     {% block section_nav %}{% endblock %}
 
       {% block hero %}{% endblock %}
-      {% block content %}{% endblock %}
+      {% block content %}
+        {% block messages %}
+          {% if messages %}
+          <ul class="messages">
+            {% for message in messages %}
+            <li{% if message.tags %} class="{{ message.tags }}" {% endif %}>
+              {{ message }}
+              </li>
+              {% endfor %}
+          </ul>
+          {% endif %}
+        {% endblock %}
+      {% endblock %}
 
     <div role="complementary">{% block complementary %}{% endblock %}</div>
 
diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html
index 15835920b..d25cd3de8 100644
--- a/src/registrar/templates/home.html
+++ b/src/registrar/templates/home.html
@@ -10,6 +10,9 @@
 {# the entire logged in page goes here #}
 
 <div class="tablet:grid-offset-1 desktop:grid-offset-2">
+  {% block messages %}
+    {% include "includes/form_messages.html" %}
+  {% endblock %}
   <h1>Manage your domains</h2>
 
   <p class="margin-top-4">
diff --git a/src/registrar/tests/test_url_auth.py b/src/registrar/tests/test_url_auth.py
index 34f80ac44..3e0514a85 100644
--- a/src/registrar/tests/test_url_auth.py
+++ b/src/registrar/tests/test_url_auth.py
@@ -23,6 +23,7 @@ SAMPLE_KWARGS = {
     "content_type_id": "2",
     "object_id": "3",
     "domain": "whitehouse.gov",
+    "user_pk": "1",
 }
 
 # Our test suite will ignore some namespaces.
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 0f894a985..e00c90b19 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -825,13 +825,19 @@ class DomainDeleteUserView(UserDomainRolePermissionDeleteView):
 
     def get_success_message(self, delete_self = False):
         """Returns confirmation content for the deletion event """
+
+        # Grab the text representation of the user we want to delete
         email_or_name = self.object.user.email
-        if email_or_name is None:
+        if email_or_name is None or email_or_name.strip() == "":
             email_or_name = self.object.user
+
+        # If the user is deleting themselves, return a special message.
+        # If not, return something more generic.
         if delete_self:
             message = f"You are no longer managing the domain {self.object.domain}."
         else:
             message = f"Removed {email_or_name} as a manager for this domain."
+
         return message
 
     def form_valid(self, form):
@@ -839,7 +845,7 @@ class DomainDeleteUserView(UserDomainRolePermissionDeleteView):
         super().form_valid(form)
 
         # Is the user deleting themselves? If so, display a different message
-        delete_self = self.request.user.email == self.object.user.email
+        delete_self = self.request.user == self.object.user
 
         # Add a success message
         messages.success(self.request, self.get_success_message(delete_self))
@@ -851,7 +857,8 @@ class DomainDeleteUserView(UserDomainRolePermissionDeleteView):
         response = super().post(request, *args, **kwargs)
 
         # If the user is deleting themselves, redirect to home
-        if self.request.user == self.object.user:
+        delete_self = self.request.user == self.object.user
+        if delete_self:
             return redirect(reverse("home"))
         
         return response
\ No newline at end of file