diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx
index 9aa79635..eebd6b1c 100644
--- a/src/components/Nav/HeaderAuth.tsx
+++ b/src/components/Nav/HeaderAuth.tsx
@@ -32,7 +32,7 @@ const MD_WIDTH_BREAKPOINT = 992
 export const HeaderAuth = (props: Props) => {
   const { t } = useLocalize()
   const { page } = useRouter()
-  const { session, author, isAuthenticated, isSessionLoaded } = useSession()
+  const { session, author, isAuthenticated } = useSession()
   const {
     unreadNotificationsCount,
     actions: { showNotificationsPanel },
@@ -111,7 +111,7 @@ export const HeaderAuth = (props: Props) => {
 
   return (
     <ShowOnlyOnClient>
-      <Show when={isSessionLoaded()} keyed={true}>
+      <Show when={session()?.user?.email_verified} keyed={true}>
         <div class={clsx('col-auto col-lg-7', styles.usernav)}>
           <div class={styles.userControl}>
             <Show when={isCreatePostButtonVisible()}>
diff --git a/src/context/session.tsx b/src/context/session.tsx
index 471770bd..7e477e1c 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -211,7 +211,7 @@ export const SessionProvider = (props: {
   onMount(async () => {
     const metaRes = await authorizer().getMetaData()
     setConfig({ ...defaultConfig, ...metaRes, redirectURL: window.location.origin })
-    let s
+    let s: AuthToken
     try {
       s = await loadSession()
     } catch (error) {