diff --git a/renderer.py b/renderer.py
index 408cd97..35d0207 100644
--- a/renderer.py
+++ b/renderer.py
@@ -527,13 +527,15 @@ def build_preauth_key_table(user_name):
         """
     return preauth_keys_collection
 
-def oidc_nav_dropdown(user_name, email_address):
+def oidc_nav_dropdown(user_name, email_address, name):
+    LOG.error("Name:  "+str(name))
     LOG.error("Username:  "+str(user_name))
     LOG.error("Email:  "+str(email_address))
     html_payload = """
         <!-- Dropdown Structure -->
         <ul id="dropdown1" class="dropdown-content">
-            <li><a href="#!">User:  """+user_name+"""</a></li>
+            <li><a href="#!">User:  """+name+"""</a></li>
+            <li><a href="#!">Username:  """+user_name+"""</a></li>
             <li><a href="#!">Email:  """+email_address+"""</a></li>
             <li class="divider"></li>
             <li><a href="logout">Logout</a></li>
@@ -541,14 +543,14 @@ def oidc_nav_dropdown(user_name, email_address):
 
         <li>
             <a class="dropdown-trigger" href="#!" data-target="dropdown1">
-                <i class="material-icons right">account_circle</i>
+                """+name+""" <i class="material-icons right">account_circle</i>
             </a>
         </li>
     """
 
     return Markup(html_payload)
 
-def oidc_nav_mobile(user_name, email_address):
+def oidc_nav_mobile(user_name, email_address, name):
 # https://materializecss.github.io/materialize/sidenav.html
     html_payload = """
         <!-- Dropdown Structure -->
diff --git a/server.py b/server.py
index 119f31e..2aea116 100644
--- a/server.py
+++ b/server.py
@@ -136,8 +136,9 @@ def overview_page():
     if AUTH_TYPE == "oidc":
         email_address = oidc.user_getfield("email")
         user_name     = oidc.user_getfield("preferred_username")
-        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address)
-        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address)
+        name          = oidc.user_getfield("name")
+        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address, name)
+        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address, name)
 
     return render_template('overview.html',
         render_page = renderer.render_overview(),
@@ -160,8 +161,9 @@ def machines_page():
     if AUTH_TYPE == "oidc":
         email_address = oidc.user_getfield("email")
         user_name     = oidc.user_getfield("preferred_username")
-        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address)
-        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address)
+        name          = oidc.user_getfield("name")
+        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address, name)
+        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address, name)
     
     cards = renderer.render_machines_cards()
     return render_template('machines.html',
@@ -186,8 +188,9 @@ def users_page():
     if AUTH_TYPE == "oidc":
         email_address = oidc.user_getfield("email")
         user_name     = oidc.user_getfield("preferred_username")
-        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address)
-        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address)
+        name          = oidc.user_getfield("name")
+        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address, name)
+        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address, name)
 
     cards = renderer.render_users_cards()
     return render_template('users.html',
@@ -212,8 +215,9 @@ def settings_page():
     if AUTH_TYPE == "oidc":
         email_address = oidc.user_getfield("email")
         user_name     = oidc.user_getfield("preferred_username")
-        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address)
-        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address)
+        name          = oidc.user_getfield("name")
+        OIDC_NAV_DROPDOWN = renderer.oidc_nav_dropdown(user_name, email_address, name)
+        OIDC_NAV_MOBILE   = renderer.oidc_nav_mobile(user_name, email_address, name)
 
     GIT_COMMIT_LINK = Markup("<a href='https://github.com/iFargle/headscale-webui/commit/"+os.environ["GIT_COMMIT"]+"'>"+str(os.environ["GIT_COMMIT"])[0:7]+"</a>")