diff --git a/src/components/auth/AccountSwitcher.tsx b/src/components/auth/AccountSwitcher.tsx
index ede15ad..6380408 100644
--- a/src/components/auth/AccountSwitcher.tsx
+++ b/src/components/auth/AccountSwitcher.tsx
@@ -1,8 +1,7 @@
 // NOTE: This file is stable and usually should not be modified.
 // It is important that all functionality in this file is preserved, and should only be modified if explicitly requested.
 
-import React from 'react';
-import { ChevronDown, LogOut, UserPlus } from 'lucide-react';
+import { ChevronDown, LogOut, UserIcon, UserPlus } from 'lucide-react';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -28,10 +27,10 @@ export function AccountSwitcher({ onAddAccountClick }: AccountSwitcherProps) {
         <button className='flex items-center gap-3 p-3 rounded-full hover:bg-accent transition-all w-full text-foreground'>
           <Avatar className='w-10 h-10'>
             <AvatarImage src={currentUser.metadata.picture} alt={currentUser.metadata.name} />
-            <AvatarFallback>{currentUser.metadata.name?.charAt(0)}</AvatarFallback>
+            <AvatarFallback>{currentUser.metadata.name?.charAt(0) || <UserIcon />}</AvatarFallback>
           </Avatar>
-          <div className='flex-1 text-left hidden md:block'>
-            <p className='font-medium text-sm'>{currentUser.metadata.name}</p>
+          <div className='flex-1 text-left hidden md:block truncate'>
+            <p className='font-medium text-sm'>{currentUser.metadata.name || currentUser.pubkey}</p>
           </div>
           <ChevronDown className='w-4 h-4 text-muted-foreground' />
         </button>
@@ -46,10 +45,10 @@ export function AccountSwitcher({ onAddAccountClick }: AccountSwitcherProps) {
           >
             <Avatar className='w-8 h-8'>
               <AvatarImage src={user.metadata.picture} alt={user.metadata.name} />
-              <AvatarFallback>{user.metadata.name?.charAt(0)}</AvatarFallback>
+              <AvatarFallback>{user.metadata.name?.charAt(0) || <UserIcon />}</AvatarFallback>
             </Avatar>
-            <div className='flex-1'>
-              <p className='text-sm font-medium'>{user.metadata.name}</p>
+            <div className='flex-1 truncate'>
+              <p className='text-sm font-medium'>{user.metadata.name || user.pubkey}</p>
             </div>
             {user.id === currentUser.id && <div className='w-2 h-2 rounded-full bg-primary'></div>}
           </DropdownMenuItem>