diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 4f968de14..3b878d366 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -42,10 +42,12 @@
           <h2 class="user-list-item-heading font-body-lg margin-y-0" title="{{ user.email_address }}">
             {%- if user.name -%}
               <span class="heading-small live-search-relevant">{{ user.name }}</span>
+            {%- else -%}
+              <span class="heading-small live-search-relevant">{{ user.email_address }}</span>
             {%- endif -%}
           </h2>
           <p class="margin-top-0">
-             {%- if user.status == 'pending' -%}
+            {%- if user.status == 'pending' -%}
               <span class="live-search-relevant">{{ user.email_address }}</span>
               <span class="hint">(invited)</span>
             {%- elif user.status == 'expired' -%}
@@ -79,7 +81,7 @@
                     ) }}
                   {% endfor %}
                 </ul>
-                 {% if current_service.all_template_folders %}
+                {% if current_service.all_template_folders %}
                   <p class="usa-body tick-cross-list-hint">
                     {% set folder_count = user.template_folders_for_service(current_service) | length %}
                     {% if folder_count == 0 %}
@@ -115,7 +117,7 @@
                 Resend invite<span class="usa-sr-only"> for {{ user.email_address }}</span>
               </a>
             {% elif user.is_editable_by(current_user) %}
-              <a class="user-list-edit-link usa-link" href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id) }}">
+              <a class="user-list-edit-link usa-link padding-x-2" href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id) }}">
                 Change details<span class="usa-sr-only"> for {{ user.name }} {{ user.email_address }}</span>
               </a>
             {% endif %}