diff --git a/src/components/Dashboard/Modals/AboutModal/AboutModal.tsx b/src/components/Dashboard/Modals/AboutModal/AboutModal.tsx
index bc3ae16a0..c8f22cd33 100644
--- a/src/components/Dashboard/Modals/AboutModal/AboutModal.tsx
+++ b/src/components/Dashboard/Modals/AboutModal/AboutModal.tsx
@@ -206,7 +206,7 @@ const useInformationTableItems = (newVersionAvailable?: string): InformationTabl
 
   let items: InformationTableItem[] = [];
 
-  if (i18n !== null) {
+  if (i18n?.reportNamespaces) {
     const usedI18nNamespaces = i18n.reportNamespaces.getUsedNamespaces();
     const initOptions = i18n.options as ExtendedInitOptions;
 
diff --git a/src/components/layout/new-header/AvatarMenu.tsx b/src/components/layout/new-header/AvatarMenu.tsx
new file mode 100644
index 000000000..83c9377a8
--- /dev/null
+++ b/src/components/layout/new-header/AvatarMenu.tsx
@@ -0,0 +1,82 @@
+import { Avatar, Badge, Menu, UnstyledButton, useMantineTheme } from '@mantine/core';
+import { useDisclosure } from '@mantine/hooks';
+import {
+  IconDashboard,
+  IconInfoCircle,
+  IconLogin,
+  IconLogout,
+  IconSun,
+  IconUserSearch,
+} from '@tabler/icons-react';
+import { User } from 'next-auth';
+import { signOut, useSession } from 'next-auth/react';
+import Link from 'next/link';
+import { forwardRef } from 'react';
+import { AboutModal } from '~/components/Dashboard/Modals/AboutModal/AboutModal';
+
+export const AvatarMenu = () => {
+  const newVersionAvailable = '0.13.0';
+  const [aboutModalOpened, aboutModal] = useDisclosure(false);
+  const { data: sessionData } = useSession();
+
+  return (
+    <>
+      <UnstyledButton>
+        <Menu>
+          <Menu.Target>
+            <CurrentUserAvatar user={sessionData?.user ?? null} />
+          </Menu.Target>
+          <Menu.Dropdown>
+            <Menu.Item icon={<IconSun size="1rem" />}>Switch theme</Menu.Item>
+            <Menu.Item icon={<IconUserSearch size="1rem" />}>View Profile</Menu.Item>
+            <Menu.Item icon={<IconDashboard size="1rem" />}>Default Dashboard</Menu.Item>
+            <Menu.Divider />
+            <Menu.Item
+              icon={<IconInfoCircle size="1rem" />}
+              rightSection={
+                newVersionAvailable && (
+                  <Badge variant="light" color="blue">
+                    New
+                  </Badge>
+                )
+              }
+              onClick={() => aboutModal.open()}
+            >
+              About
+            </Menu.Item>
+            {sessionData?.user ? (
+              <Menu.Item icon={<IconLogout size="1rem" />} color="red" onClick={() => signOut()}>
+                Logout
+              </Menu.Item>
+            ) : (
+              <Menu.Item icon={<IconLogin size="1rem" />} component={Link} href="/auth/login">
+                Login
+              </Menu.Item>
+            )}
+          </Menu.Dropdown>
+        </Menu>
+      </UnstyledButton>
+
+      <AboutModal
+        opened={aboutModalOpened}
+        closeModal={aboutModal.close}
+        newVersionAvailable={newVersionAvailable}
+      />
+    </>
+  );
+};
+
+type CurrentUserAvatarProps = {
+  user: User | null;
+};
+const CurrentUserAvatar = forwardRef<HTMLDivElement, CurrentUserAvatarProps>(
+  ({ user, ...others }, ref) => {
+    const { primaryColor } = useMantineTheme();
+    if (!user) return <Avatar ref={ref} {...others} />;
+    return (
+      <Avatar ref={ref} color={primaryColor} {...others}>
+        {user.name?.slice(0, 2).toUpperCase()}
+      </Avatar>
+    );
+  }
+);
diff --git a/src/components/layout/new-header/Header.tsx b/src/components/layout/new-header/Header.tsx
index 5ac92e1fc..eb0796ee2 100644
--- a/src/components/layout/new-header/Header.tsx
+++ b/src/components/layout/new-header/Header.tsx
@@ -21,6 +21,7 @@ import { signOut } from 'next-auth/react';
 import Link from 'next/link';
 
 import { Logo } from '../Logo';
+import { AvatarMenu } from './AvatarMenu';
 import { Search } from './search';
 
 type MainHeaderProps = {
@@ -41,22 +42,7 @@ export const MainHeader = ({ showExperimental = false, logoHref = '/' }: MainHea
         <Search />
 
         <Group noWrap>
-          <UnstyledButton>
-            <Menu>
-              <Menu.Target>
-                <Avatar />
-              </Menu.Target>
-              <Menu.Dropdown>
-                <Menu.Item icon={<IconSun size="1rem" />}>Switch theme</Menu.Item>
-                <Menu.Item icon={<IconUserSearch size="1rem" />}>View Profile</Menu.Item>
-                <Menu.Item icon={<IconDashboard size="1rem" />}>Default Dashboard</Menu.Item>
-                <Menu.Divider />
-                <Menu.Item icon={<IconLogout size="1rem" />} color="red" onClick={() => signOut()}>
-                  Logout
-                </Menu.Item>
-              </Menu.Dropdown>
-            </Menu>
-          </UnstyledButton>
+          <AvatarMenu />
         </Group>
       </Group>
     </Header>