diff --git a/libs/web/core/feature/src/lib/web-core.feature.tsx b/libs/web/core/feature/src/lib/web-core.feature.tsx
index 6a8c41d..809c820 100644
--- a/libs/web/core/feature/src/lib/web-core.feature.tsx
+++ b/libs/web/core/feature/src/lib/web-core.feature.tsx
@@ -8,6 +8,13 @@ const theme = createTheme({
     brand: DEFAULT_THEME.colors.blue,
   },
   primaryColor: 'brand',
+  components: {
+    Avatar: {
+      defaultProps: {
+        variant: 'filled',
+      },
+    },
+  },
 })
 
 export function WebCoreFeature() {
diff --git a/libs/web/core/ui/src/lib/ui-header-profile.tsx b/libs/web/core/ui/src/lib/ui-header-profile.tsx
index b5bd8f7..242cc3c 100644
--- a/libs/web/core/ui/src/lib/ui-header-profile.tsx
+++ b/libs/web/core/ui/src/lib/ui-header-profile.tsx
@@ -11,7 +11,7 @@ export function UiHeaderProfile({ user, logout }: { user?: User | null; logout:
   const isAdmin = user?.role === UserRole.Admin
   const isDeveloper = user?.developer ?? false
 
-  return user ? (
+  return user?.username ? (
     <Menu
       width={260}
       position="bottom-end"
diff --git a/libs/web/user/ui/src/lib/user-ui-avatar.tsx b/libs/web/user/ui/src/lib/user-ui-avatar.tsx
index a56da48..8fbde81 100644
--- a/libs/web/user/ui/src/lib/user-ui-avatar.tsx
+++ b/libs/web/user/ui/src/lib/user-ui-avatar.tsx
@@ -6,5 +6,5 @@ export type UserUiAvatarProps = UiAvatarProps & {
 }
 
 export function UserUiAvatar({ user, ...props }: UserUiAvatarProps) {
-  return <UiAvatar url={user?.avatarUrl} name={user?.username} {...props} />
+  return <UiAvatar url={user?.avatarUrl} name={user?.username ?? undefined} {...props} />
 }