From dd96fb432c36468e4d2a32c013ebb4ea088dd758 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Wed, 7 Dec 2022 10:20:56 -0600
Subject: [PATCH 1/3] Use email as username

---
 src/registrar/templates/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 1c544c352..003a2689e 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -145,9 +145,9 @@
         <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>
             {% else %}
-            <a href="/openid/login">Sign in</a>
+            <a href="/openid/login"><span>Sign in</span></a>
             {% endif %}
           </li>
         </ul>

From 76fc7486c61167304080fcf33aae6123b66025d2 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Wed, 7 Dec 2022 12:44:55 -0600
Subject: [PATCH 2/3] Add sign out link

---
 src/registrar/templates/base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 003a2689e..674ff4957 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -145,7 +145,8 @@
         <ul class="usa-nav__primary usa-accordion">
           <li class="usa-nav__primary-item">
             {% if user.is_authenticated %}
-            <a href="/whoami"><span>{{ user.email }}</span></a>
+            <a href="/whoami"><span>{{ user.email }}</span></a> | <a
+                href="/openid/logout"><span>Sign out</span></a>
             {% else %}
             <a href="/openid/login"><span>Sign in</span></a>
             {% endif %}

From 7b76216cb366845d37053c1dcd7c1f6b32c9a5ee Mon Sep 17 00:00:00 2001
From: igorkorenfeld <igor.korenfeld@gsa.gov>
Date: Wed, 7 Dec 2022 14:43:52 -0500
Subject: [PATCH 3/3] Adjust alignment on sign out button

---
 src/registrar/templates/base.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 674ff4957..d77080a9c 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -145,8 +145,12 @@
         <ul class="usa-nav__primary usa-accordion">
           <li class="usa-nav__primary-item">
             {% if user.is_authenticated %}
-            <a href="/whoami"><span>{{ user.email }}</span></a> | <a
-                href="/openid/logout"><span>Sign out</span></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"><span>Sign in</span></a>
             {% endif %}