diff --git a/internal/server/auth/method/github/server.go b/internal/server/auth/method/github/server.go
index 4a4887e848..f997eeace5 100644
--- a/internal/server/auth/method/github/server.go
+++ b/internal/server/auth/method/github/server.go
@@ -32,10 +32,11 @@ type OAuth2Client interface {
 }
 
 const (
-	storageMetadataGithubEmail   = "io.flipt.auth.github.email"
-	storageMetadataGithubName    = "io.flipt.auth.github.name"
-	storageMetadataGithubPicture = "io.flipt.auth.github.picture"
-	storageMetadataGithubSub     = "io.flipt.auth.github.sub"
+	storageMetadataGithubEmail             = "io.flipt.auth.github.email"
+	storageMetadataGithubName              = "io.flipt.auth.github.name"
+	storageMetadataGithubPicture           = "io.flipt.auth.github.picture"
+	storageMetadataGithubSub               = "io.flipt.auth.github.sub"
+	storageMetadataGitHubPreferredUsername = "io.flipt.auth.github.preferred_username"
 )
 
 // Server is an Github server side handler.
@@ -140,6 +141,7 @@ func (s *Server) Callback(ctx context.Context, r *auth.CallbackRequest) (*auth.C
 		Name      string `json:"name,omitempty"`
 		Email     string `json:"email,omitempty"`
 		AvatarURL string `json:"avatar_url,omitempty"`
+		Login     string `json:"login,omitempty"`
 		ID        uint64 `json:"id,omitempty"`
 	}
 
@@ -165,6 +167,10 @@ func (s *Server) Callback(ctx context.Context, r *auth.CallbackRequest) (*auth.C
 		metadata[storageMetadataGithubSub] = fmt.Sprintf("%d", githubUserResponse.ID)
 	}
 
+	if githubUserResponse.Login != "" {
+		metadata[storageMetadataGitHubPreferredUsername] = githubUserResponse.Login
+	}
+
 	clientToken, a, err := s.store.CreateAuthentication(ctx, &storageauth.CreateAuthenticationRequest{
 		Method:    auth.Method_METHOD_GITHUB,
 		ExpiresAt: timestamppb.New(time.Now().UTC().Add(s.config.Session.TokenLifetime)),
diff --git a/internal/server/auth/method/oidc/server.go b/internal/server/auth/method/oidc/server.go
index 5e3b228c12..a4d7e931d5 100644
--- a/internal/server/auth/method/oidc/server.go
+++ b/internal/server/auth/method/oidc/server.go
@@ -19,13 +19,14 @@ import (
 )
 
 const (
-	storageMetadataOIDCProviderKey    = "io.flipt.auth.oidc.provider"
-	storageMetadataIDEmailKey         = "io.flipt.auth.oidc.email"
-	storageMetadataIDEmailVerifiedKey = "io.flipt.auth.oidc.email_verified"
-	storageMetadataIDNameKey          = "io.flipt.auth.oidc.name"
-	storageMetadataIDProfileKey       = "io.flipt.auth.oidc.profile"
-	storageMetadataIDPictureKey       = "io.flipt.auth.oidc.picture"
-	storageMetadataIDSubKey           = "io.flipt.auth.oidc.sub"
+	storageMetadataOIDCProvider          = "io.flipt.auth.oidc.provider"
+	storageMetadataOIDCEmail             = "io.flipt.auth.oidc.email"
+	storageMetadataOIDCEmailVerified     = "io.flipt.auth.oidc.email_verified"
+	storageMetadataOIDCName              = "io.flipt.auth.oidc.name"
+	storageMetadataOIDCProfile           = "io.flipt.auth.oidc.profile"
+	storageMetadataOIDCPicture           = "io.flipt.auth.oidc.picture"
+	storageMetadataOIDCSub               = "io.flipt.auth.oidc.sub"
+	storageMetadataOIDCPreferredUsername = "io.flipt.auth.oidc.preferred_username"
 )
 
 // errProviderNotFound is returned when a provider is requested which
@@ -133,7 +134,7 @@ func (s *Server) Callback(ctx context.Context, req *auth.CallbackRequest) (_ *au
 	}
 
 	metadata := map[string]string{
-		storageMetadataOIDCProviderKey: req.Provider,
+		storageMetadataOIDCProvider: req.Provider,
 	}
 
 	// Extract custom claims
@@ -230,13 +231,13 @@ func (c claims) addToMetadata(m map[string]string) {
 		}
 	}
 
-	set(storageMetadataIDEmailKey, c.Email)
-	set(storageMetadataIDNameKey, c.Name)
-	set(storageMetadataIDProfileKey, c.Profile)
-	set(storageMetadataIDPictureKey, c.Picture)
-	set(storageMetadataIDSubKey, c.Sub)
+	set(storageMetadataOIDCEmail, c.Email)
+	set(storageMetadataOIDCName, c.Name)
+	set(storageMetadataOIDCProfile, c.Profile)
+	set(storageMetadataOIDCPicture, c.Picture)
+	set(storageMetadataOIDCSub, c.Sub)
 
 	if c.Verified != nil {
-		m[storageMetadataIDEmailVerifiedKey] = fmt.Sprintf("%v", *c.Verified)
+		m[storageMetadataOIDCEmailVerified] = fmt.Sprintf("%v", *c.Verified)
 	}
 }
diff --git a/magefile.go b/magefile.go
index bc673ef774..9e4cf7eced 100644
--- a/magefile.go
+++ b/magefile.go
@@ -137,12 +137,13 @@ type Go mg.Namespace
 
 // Keeping these aliases for backwards compatibility for now
 var Aliases = map[string]interface{}{
-	"dev":   Go.Run,
-	"test":  Go.Test,
-	"bench": Go.Bench,
-	"lint":  Go.Lint,
-	"fmt":   Go.Fmt,
-	"proto": Go.Proto,
+	"dev":    Go.Run,
+	"test":   Go.Test,
+	"bench":  Go.Bench,
+	"lint":   Go.Lint,
+	"fmt":    Go.Fmt,
+	"proto":  Go.Proto,
+	"ui:dev": UI.Run,
 }
 
 // Runs Go benchmarking tests
diff --git a/ui/src/components/header/ReadOnly.tsx b/ui/src/components/header/ReadOnly.tsx
index 03a5efeb5f..66fcda287d 100644
--- a/ui/src/components/header/ReadOnly.tsx
+++ b/ui/src/components/header/ReadOnly.tsx
@@ -8,6 +8,7 @@ import {
 import { useSelector } from 'react-redux';
 import { selectConfig } from '~/app/meta/metaSlice';
 import { Icon } from '~/types/Icon';
+import { titleCase } from '~/utils/helpers';
 
 const storageTypes: Record<string, Icon> = {
   local: DocumentIcon,
@@ -27,10 +28,12 @@ export default function ReadOnly() {
   return (
     <span
       className="nightwind-prevent text-white inline-flex items-center gap-x-1.5 rounded-md px-3 py-1 text-xs font-medium"
-      title={`Backed by ${config.storage?.type || 'unknown'} storage`}
+      title={`Backed by ${titleCase(
+        config.storage?.type || 'unknown'
+      )} Storage`}
     >
       {StorageIcon && (
-        <StorageIcon className="h-3 w-3 fill-gray-200" aria-hidden="true" />
+        <StorageIcon className="h-4 w-4 fill-gray-200" aria-hidden="true" />
       )}
       Read-Only
     </span>
diff --git a/ui/src/components/header/UserProfile.tsx b/ui/src/components/header/UserProfile.tsx
index f6eea8c818..054a2e06c8 100644
--- a/ui/src/components/header/UserProfile.tsx
+++ b/ui/src/components/header/UserProfile.tsx
@@ -19,19 +19,27 @@ export default function UserProfile(props: UserProfileProps) {
   const { clearSession } = useSession();
 
   let name: string | undefined;
+  let login: string | undefined;
   let imgURL: string | undefined;
 
   if (metadata) {
+    // TODO: dry this up
     if ('io.flipt.auth.github.name' in metadata) {
       name = metadata['io.flipt.auth.github.name'] ?? 'User';
       if (metadata['io.flipt.auth.github.picture']) {
         imgURL = metadata['io.flipt.auth.github.picture'];
       }
+      if (metadata['io.flipt.auth.github.preferred_username']) {
+        login = metadata['io.flipt.auth.github.preferred_username'];
+      }
     } else if ('io.flipt.auth.oidc.name' in metadata) {
       name = metadata['io.flipt.auth.oidc.name'] ?? 'User';
       if (metadata['io.flipt.auth.oidc.picture']) {
         imgURL = metadata['io.flipt.auth.oidc.picture'];
       }
+      if (metadata['io.flipt.auth.oidc.preferred_username']) {
+        login = metadata['io.flipt.auth.oidc.preferred_username'];
+      }
     }
   }
 
@@ -49,11 +57,11 @@ export default function UserProfile(props: UserProfileProps) {
   return (
     <Menu as="div" className="relative ml-3">
       <div>
-        <Menu.Button className="nightwind-prevent bg-white flex max-w-xs items-center rounded-full text-sm hover:ring-2 hover:ring-violet-500/80 focus:outline-none focus:ring-1 focus:ring-violet-500 focus:ring-offset-2">
+        <Menu.Button className="nightwind-prevent bg-white flex max-w-xs items-center rounded-full text-sm ring-1 ring-white hover:ring-2 hover:ring-violet-500/80 focus:outline-none focus:ring-1 focus:ring-violet-500 focus:ring-offset-2">
           <span className="sr-only">Open user menu</span>
           {imgURL && (
             <img
-              className="h-6 w-6 rounded-full"
+              className="h-7 w-7 rounded-full"
               src={imgURL}
               alt={name}
               title={name}
@@ -78,6 +86,21 @@ export default function UserProfile(props: UserProfileProps) {
         leaveTo="transform opacity-0 scale-95"
       >
         <Menu.Items className="bg-white absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+          <Menu.Item disabled>
+            {({ active }) => (
+              <span
+                className={classNames(
+                  active ? 'bg-gray-100' : '',
+                  'border-gray-200 flex flex-col border-b px-4 py-2'
+                )}
+              >
+                <span className="text-gray-600 flex-1 text-sm">{name}</span>
+                {login && (
+                  <span className="text-gray-400 text-xs">{login}</span>
+                )}
+              </span>
+            )}
+          </Menu.Item>
           <Menu.Item key="logout">
             {({ active }) => (
               <a
diff --git a/ui/src/types/auth/Github.ts b/ui/src/types/auth/Github.ts
index ceeee070c6..810eaa6ba2 100644
--- a/ui/src/types/auth/Github.ts
+++ b/ui/src/types/auth/Github.ts
@@ -12,6 +12,7 @@ export interface IAuthMethodGithubMetadata {
   'io.flipt.auth.github.email'?: string;
   'io.flipt.auth.github.name'?: string;
   'io.flipt.auth.github.picture'?: string;
+  'io.flipt.auth.github.preferred_username'?: string;
 }
 
 export interface IAuthGithubInternal extends IAuth {
diff --git a/ui/src/types/auth/OIDC.ts b/ui/src/types/auth/OIDC.ts
index 515f03686e..ee490495c4 100644
--- a/ui/src/types/auth/OIDC.ts
+++ b/ui/src/types/auth/OIDC.ts
@@ -13,11 +13,12 @@ export interface IAuthMethodOIDC extends IAuthMethod {
 }
 
 export interface IAuthMethodOIDCMetadata {
+  'io.flipt.auth.oidc.provider': string;
   'io.flipt.auth.oidc.email'?: string;
   'io.flipt.auth.oidc.email_verified'?: string;
   'io.flipt.auth.oidc.name'?: string;
   'io.flipt.auth.oidc.picture'?: string;
-  'io.flipt.auth.oidc.provider': string;
+  'io.flipt.auth.oidc.preferred_username'?: string;
 }
 
 export interface IAuthOIDCInternal extends IAuth {
diff --git a/ui/src/utils/helpers.ts b/ui/src/utils/helpers.ts
index 6d2c1a68ce..93b2a8f501 100644
--- a/ui/src/utils/helpers.ts
+++ b/ui/src/utils/helpers.ts
@@ -13,6 +13,14 @@ export function copyTextToClipboard(text: string) {
   }
 }
 
+export function titleCase(str: string) {
+  return str
+    .toLowerCase()
+    .split(' ')
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ');
+}
+
 export function stringAsKey(str: string) {
   return str.toLowerCase().split(/\s+/).join('-');