diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 1c544c352..d77080a9c 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -145,9 +145,14 @@
         <ul class="usa-nav__primary usa-accordion">
           <li class="usa-nav__primary-item">
             {% if user.is_authenticated %}
-            User: <a href="/whoami">{{ user.get_username }}</a>
+            <a href="/whoami"><span>{{ user.email }}</span></a>
+          </li>
+          <li class="usa-nav__primary-item display-flex flex-align-center">
+            <span class="text-base"> | </span>
+            <a href="/openid/logout"><span class="text-primary">Sign out</span></a>
+          </li>
             {% else %}
-            <a href="/openid/login">Sign in</a>
+            <a href="/openid/login"><span>Sign in</span></a>
             {% endif %}
           </li>
         </ul>