diff --git a/components/ActionBar/DesktopNavigation.tsx b/components/ActionBar/DesktopNavigation.tsx
index a63cc222..4447e091 100644
--- a/components/ActionBar/DesktopNavigation.tsx
+++ b/components/ActionBar/DesktopNavigation.tsx
@@ -32,9 +32,11 @@ export const DesktopNavigation = (props: {
         {identity ? (
           <>
             <ProfileButton />
-            <NotificationButton
-              current={props.currentPage === "notifications"}
-            />
+            {identity.atp_did && (
+              <NotificationButton
+                current={props.currentPage === "notifications"}
+              />
+            )}
           </>
         ) : (
           <LoginModal
diff --git a/components/ActionBar/MobileNavigation.tsx b/components/ActionBar/MobileNavigation.tsx
index 87232d1b..b57eea87 100644
--- a/components/ActionBar/MobileNavigation.tsx
+++ b/components/ActionBar/MobileNavigation.tsx
@@ -54,7 +54,7 @@ export const MobileNavigation = (props: {
       </div>
       {identity ? (
         <div className="flex gap-2">
-          <NotificationButton />
+          {identity.atp_did && <NotificationButton />}
           <ProfileButton />
         </div>
       ) : (
diff --git a/components/ActionBar/ProfileButton.tsx b/components/ActionBar/ProfileButton.tsx
index e2f1afc0..7c064ef0 100644
--- a/components/ActionBar/ProfileButton.tsx
+++ b/components/ActionBar/ProfileButton.tsx
@@ -44,7 +44,11 @@ export const ProfileButton = () => {
               <AccountSmall />
             )
           }
-          label={record ? record.displayName || record.handle : "Account"}
+          label={
+            record
+              ? record.displayName || record.handle
+              : identity?.email || "Account"
+          }
           className={`w-full`}
         />
       }