diff --git a/web/src/app.d.ts b/web/src/app.d.ts
index acacd3506..13619596b 100644
--- a/web/src/app.d.ts
+++ b/web/src/app.d.ts
@@ -16,5 +16,6 @@ declare namespace svelte.JSX {
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	interface HTMLAttributes<T> {
 		oncopyImage?: () => void;
+		onoutclick?: () => void;
 	}
 }
diff --git a/web/src/lib/components/shared-components/base-modal.svelte b/web/src/lib/components/shared-components/base-modal.svelte
index 4a445453d..c1bcae920 100644
--- a/web/src/lib/components/shared-components/base-modal.svelte
+++ b/web/src/lib/components/shared-components/base-modal.svelte
@@ -35,7 +35,7 @@
 >
 	<div
 		use:clickOutside
-		on:out-click={() => dispatch('close')}
+		on:outclick={() => dispatch('close')}
 		class="bg-immich-bg dark:bg-immich-dark-gray dark:text-immich-dark-fg w-[450px] min-h-[200px] max-h-[500px] rounded-lg shadow-md"
 	>
 		<div class="flex justify-between place-items-center px-5 py-3">
diff --git a/web/src/lib/components/shared-components/context-menu/context-menu.svelte b/web/src/lib/components/shared-components/context-menu/context-menu.svelte
index 641b629ab..32e2e2c55 100644
--- a/web/src/lib/components/shared-components/context-menu/context-menu.svelte
+++ b/web/src/lib/components/shared-components/context-menu/context-menu.svelte
@@ -35,7 +35,7 @@
 	class="absolute w-[200px] z-[99999] rounded-lg overflow-hidden"
 	style={`top: ${y}px; left: ${x}px;`}
 	use:clickOutside
-	on:out-click={() => dispatch('clickoutside')}
+	on:outclick={() => dispatch('clickoutside')}
 >
 	<slot />
 </div>
diff --git a/web/src/lib/components/shared-components/full-screen-modal.svelte b/web/src/lib/components/shared-components/full-screen-modal.svelte
index 5e6fad489..40f84da9e 100644
--- a/web/src/lib/components/shared-components/full-screen-modal.svelte
+++ b/web/src/lib/components/shared-components/full-screen-modal.svelte
@@ -11,7 +11,7 @@
 	out:fade={{ duration: 100 }}
 	class="absolute left-0 top-0 w-full h-full bg-black/40 z-[100] flex place-items-center place-content-center"
 >
-	<div class="z-[9999]" use:clickOutside on:out-click={() => dispatch('clickOutside')}>
+	<div class="z-[9999]" use:clickOutside on:outclick={() => dispatch('clickOutside')}>
 		<slot />
 	</div>
 </section>
diff --git a/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte b/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte
new file mode 100644
index 000000000..849af8615
--- /dev/null
+++ b/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte
@@ -0,0 +1,79 @@
+<script lang="ts">
+	import { clickOutside } from '$lib/utils/click-outside';
+	import { api, UserResponseDto } from '@api';
+	import { createEventDispatcher } from 'svelte';
+	import { page } from '$app/stores';
+	import { fade } from 'svelte/transition';
+	import Cog from 'svelte-material-icons/Cog.svelte';
+	import { goto } from '$app/navigation';
+
+	export let user: UserResponseDto;
+
+	const dispatch = createEventDispatcher();
+
+	const getFirstLetter = (text?: string) => {
+		return text?.charAt(0).toUpperCase();
+	};
+
+	const getUserProfileImage = async () => {
+		return await api.userApi.getProfileImage(user.id);
+	};
+</script>
+
+<div
+	in:fade={{ duration: 100 }}
+	out:fade={{ duration: 100 }}
+	id="account-info-panel"
+	class="absolute right-[25px] top-[75px] bg-immich-bg dark:bg-immich-dark-gray dark:border dark:border-immich-dark-gray shadow-lg rounded-2xl w-[360px] text-center z-[100]"
+	use:clickOutside
+	on:outclick={() => dispatch('close')}
+>
+	<div class="flex place-items-center place-content-center mt-6">
+		<button
+			class="flex place-items-center place-content-center rounded-full bg-immich-primary dark:bg-immich-dark-primary dark:immich-dark-primary/80 h-20 w-20 text-gray-100 hover:bg-immich-primary dark:text-immich-dark-bg"
+		>
+			{#await getUserProfileImage() then}
+				<img
+					transition:fade={{ duration: 100 }}
+					src={`${$page.url.origin}/api/user/profile-image/${user.id}`}
+					alt="profile-img"
+					class="inline rounded-full h-20 w-20 object-cover shadow-md"
+				/>
+			{:catch}
+				<div transition:fade={{ duration: 200 }} class="text-lg">
+					{getFirstLetter(user.firstName)}{getFirstLetter(user.lastName)}
+				</div>
+			{/await}
+		</button>
+	</div>
+
+	<p class="text-lg text-immich-primary dark:text-immich-dark-primary font-medium mt-4">
+		{user.firstName}
+		{user.lastName}
+	</p>
+
+	<p class="text-sm text-gray-500 dark:text-immich-dark-fg">{user.email}</p>
+
+	<div class="mt-4 flex place-items-center place-content-center">
+		<button
+			class="flex border rounded-3xl px-6 py-2 hover:bg-gray-50 dark:border-immich-dark-gray dark:bg-gray-300 dark:hover:bg-immich-dark-primary font-medium place-items-center place-content-center gap-2 text-xs"
+			on:click={() => {
+				goto('/user-settings');
+				dispatch('close');
+			}}
+		>
+			<span><Cog size="18" /></span>Manage your Immich account</button
+		>
+	</div>
+
+	<div class="my-4">
+		<hr class="dark:border-immich-dark-bg" />
+	</div>
+
+	<div class="mb-6">
+		<button
+			class="border rounded-3xl px-6 py-2 hover:bg-gray-50 dark:border-immich-dark-gray dark:bg-gray-300 dark:hover:bg-immich-dark-primary text-xs"
+			on:click={() => dispatch('logout')}>Sign Out</button
+		>
+	</div>
+</div>
diff --git a/web/src/lib/components/shared-components/navigation-bar.svelte b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
similarity index 65%
rename from web/src/lib/components/shared-components/navigation-bar.svelte
rename to web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
index b66f47099..8d9b0056b 100644
--- a/web/src/lib/components/shared-components/navigation-bar.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
@@ -4,16 +4,14 @@
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { fade, fly } from 'svelte/transition';
 	import TrayArrowUp from 'svelte-material-icons/TrayArrowUp.svelte';
-	import { clickOutside } from '../../utils/click-outside';
 	import { api, UserResponseDto } from '@api';
-	import ThemeButton from './theme-button.svelte';
-	import { AppRoute } from '../../constants';
-
+	import ThemeButton from '../theme-button.svelte';
+	import { AppRoute } from '../../../constants';
+	import AccountInfoPanel from './account-info-panel.svelte';
 	export let user: UserResponseDto;
 	export let shouldShowUploadButton = true;
 
 	let shouldShowAccountInfo = false;
-	let shouldShowProfileImage = false;
 
 	const dispatch = createEventDispatcher();
 	let shouldShowAccountInfoPanel = false;
@@ -23,12 +21,7 @@
 	});
 
 	const getUserProfileImage = async () => {
-		try {
-			await api.userApi.getProfileImage(user.id);
-			shouldShowProfileImage = true;
-		} catch (e) {
-			shouldShowProfileImage = false;
-		}
+		return await api.userApi.getProfileImage(user.id);
 	};
 	const getFirstLetter = (text?: string) => {
 		return text?.charAt(0).toUpperCase();
@@ -103,15 +96,16 @@
 				<button
 					class="flex place-items-center place-content-center rounded-full bg-immich-primary hover:bg-immich-primary/80 h-12 w-12 text-gray-100 dark:text-immich-dark-bg dark:bg-immich-dark-primary"
 				>
-					{#if shouldShowProfileImage}
+					{#await getUserProfileImage() then}
 						<img
-							src={`api/user/profile-image/${user.id}`}
+							transition:fade={{ duration: 100 }}
+							src={`${$page.url.origin}/api/user/profile-image/${user.id}`}
 							alt="profile-img"
 							class="inline rounded-full h-12 w-12 object-cover shadow-md"
 						/>
-					{:else}
+					{:catch}
 						{getFirstLetter(user.firstName)}{getFirstLetter(user.lastName)}
-					{/if}
+					{/await}
 				</button>
 
 				{#if shouldShowAccountInfo}
@@ -129,49 +123,10 @@
 	</div>
 
 	{#if shouldShowAccountInfoPanel}
-		<div
-			in:fade={{ duration: 100 }}
-			out:fade={{ duration: 100 }}
-			id="account-info-panel"
-			class="absolute right-[25px] top-[75px] bg-immich-bg dark:bg-immich-dark-gray dark:border dark:border-immich-dark-gray shadow-lg rounded-2xl w-[360px] text-center z-[100]"
-			use:clickOutside
-			on:out-click={() => (shouldShowAccountInfoPanel = false)}
-		>
-			<div class="flex place-items-center place-content-center mt-6">
-				<button
-					class="flex place-items-center place-content-center rounded-full bg-immich-primary dark:bg-immich-dark-primary dark:immich-dark-primary/80 h-20 w-20 text-gray-100 hover:bg-immich-primary dark:text-immich-dark-bg"
-				>
-					{#if shouldShowProfileImage}
-						<img
-							src={`api/user/profile-image/${user.id}`}
-							alt="profile-img"
-							class="inline rounded-full h-20 w-20 object-cover shadow-md"
-						/>
-					{:else}
-						<div class="text-lg">
-							{getFirstLetter(user.firstName)}{getFirstLetter(user.lastName)}
-						</div>
-					{/if}
-				</button>
-			</div>
-
-			<p class="text-lg text-immich-primary dark:text-immich-dark-primary font-medium mt-4">
-				{user.firstName}
-				{user.lastName}
-			</p>
-
-			<p class="text-sm text-gray-500 dark:text-immich-dark-fg">{user.email}</p>
-
-			<div class="my-4">
-				<hr class="dark:border-immich-dark-bg" />
-			</div>
-
-			<div class="mb-6">
-				<button
-					class="border rounded-3xl px-6 py-2 hover:bg-gray-50 dark:border-immich-dark-gray dark:bg-gray-300 dark:hover:bg-immich-dark-primary"
-					on:click={logOut}>Sign Out</button
-				>
-			</div>
-		</div>
+		<AccountInfoPanel
+			{user}
+			on:close={() => (shouldShowAccountInfoPanel = false)}
+			on:logout={logOut}
+		/>
 	{/if}
 </section>
diff --git a/web/src/lib/components/user-settings-page/user-settings-list.svelte b/web/src/lib/components/user-settings-page/user-settings-list.svelte
new file mode 100644
index 000000000..a7a967715
--- /dev/null
+++ b/web/src/lib/components/user-settings-page/user-settings-list.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+	import { UserResponseDto } from '@api';
+	import SettingAccordion from '../admin-page/settings/setting-accordion.svelte';
+	import SettingInputField, {
+		SettingInputFieldType
+	} from '../admin-page/settings/setting-input-field.svelte';
+
+	export let user: UserResponseDto;
+</script>
+
+<SettingAccordion title="User profile" subtitle="Manage the user information">
+	<section class="my-4">
+		<SettingInputField
+			inputType={SettingInputFieldType.TEXT}
+			label="First name"
+			bind:value={user.firstName}
+			required={true}
+		/>
+
+		<SettingInputField
+			inputType={SettingInputFieldType.TEXT}
+			label="Last name"
+			bind:value={user.lastName}
+			required={true}
+		/>
+	</section>
+</SettingAccordion>
diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts
index 60ed0957c..1cca2c1bd 100644
--- a/web/src/lib/constants.ts
+++ b/web/src/lib/constants.ts
@@ -3,7 +3,7 @@ export const loginPageMessage: string | undefined = env.PUBLIC_LOGIN_PAGE_MESSAG
 
 export enum AppRoute {
 	ADMIN_USER_MANAGEMENT = '/admin/user-management',
-	ADMIN_SETTINGS = '/admin/settings',
+	ADMIN_SETTINGS = '/admin/system-settings',
 	ADMIN_STATS = '/admin/server-status',
 	ADMIN_JOBS = '/admin/jobs-status',
 
diff --git a/web/src/lib/utils/click-outside.ts b/web/src/lib/utils/click-outside.ts
index 0afdf8923..dae984862 100644
--- a/web/src/lib/utils/click-outside.ts
+++ b/web/src/lib/utils/click-outside.ts
@@ -2,7 +2,7 @@ export function clickOutside(node: Node) {
 	const handleClick = (event: Event) => {
 		const targetNode = event.target as Node | null;
 		if (!node.contains(targetNode)) {
-			node.dispatchEvent(new CustomEvent('out-click'));
+			node.dispatchEvent(new CustomEvent('outclick'));
 		}
 	};
 
diff --git a/web/src/routes/admin/+layout.svelte b/web/src/routes/admin/+layout.svelte
index f00887740..2d50faaab 100644
--- a/web/src/routes/admin/+layout.svelte
+++ b/web/src/routes/admin/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { page } from '$app/stores';
-	import NavigationBar from '$lib/components/shared-components/navigation-bar.svelte';
+	import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
 	import SideBarButton from '$lib/components/shared-components/side-bar/side-bar-button.svelte';
 	import AccountMultipleOutline from 'svelte-material-icons/AccountMultipleOutline.svelte';
 	import Sync from 'svelte-material-icons/Sync.svelte';
@@ -15,7 +15,7 @@
 			case AppRoute.ADMIN_USER_MANAGEMENT:
 				return 'User Management';
 			case AppRoute.ADMIN_SETTINGS:
-				return 'Settings';
+				return 'System Settings';
 			case AppRoute.ADMIN_JOBS:
 				return 'Jobs';
 			case AppRoute.ADMIN_STATS:
diff --git a/web/src/routes/admin/settings/+page.server.ts b/web/src/routes/admin/system-settings/+page.server.ts
similarity index 100%
rename from web/src/routes/admin/settings/+page.server.ts
rename to web/src/routes/admin/system-settings/+page.server.ts
diff --git a/web/src/routes/admin/settings/+page.svelte b/web/src/routes/admin/system-settings/+page.svelte
similarity index 97%
rename from web/src/routes/admin/settings/+page.svelte
rename to web/src/routes/admin/system-settings/+page.svelte
index 4698e84c8..741c882e5 100644
--- a/web/src/routes/admin/settings/+page.svelte
+++ b/web/src/routes/admin/system-settings/+page.svelte
@@ -18,7 +18,7 @@
 </script>
 
 <svelte:head>
-	<title>Settings - Immich</title>
+	<title>System Settings - Immich</title>
 </svelte:head>
 
 <section class="">
diff --git a/web/src/routes/albums/+page.svelte b/web/src/routes/albums/+page.svelte
index fa6a8537c..e59d63e3a 100644
--- a/web/src/routes/albums/+page.svelte
+++ b/web/src/routes/albums/+page.svelte
@@ -6,7 +6,7 @@
 	import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
 	import DeleteOutline from 'svelte-material-icons/DeleteOutline.svelte';
 	import type { PageData } from './$types';
-	import NavigationBar from '$lib/components/shared-components/navigation-bar.svelte';
+	import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
 	import SideBar from '$lib/components/shared-components/side-bar/side-bar.svelte';
 	import PlusBoxOutline from 'svelte-material-icons/PlusBoxOutline.svelte';
 	import { useAlbums } from './albums.bloc';
diff --git a/web/src/routes/photos/+page.svelte b/web/src/routes/photos/+page.svelte
index 1e82688cf..f25873ed1 100644
--- a/web/src/routes/photos/+page.svelte
+++ b/web/src/routes/photos/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import NavigationBar from '$lib/components/shared-components/navigation-bar.svelte';
+	import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
 	import SideBar from '$lib/components/shared-components/side-bar/side-bar.svelte';
 	import AssetGrid from '$lib/components/photos-page/asset-grid.svelte';
 	import ContextMenu from '$lib/components/shared-components/context-menu/context-menu.svelte';
diff --git a/web/src/routes/sharing/+page.svelte b/web/src/routes/sharing/+page.svelte
index 2bd54101f..df27095f4 100644
--- a/web/src/routes/sharing/+page.svelte
+++ b/web/src/routes/sharing/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import NavigationBar from '$lib/components/shared-components/navigation-bar.svelte';
+	import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
 	import SideBar from '$lib/components/shared-components/side-bar/side-bar.svelte';
 	import PlusBoxOutline from 'svelte-material-icons/PlusBoxOutline.svelte';
 	import SharedAlbumListTile from '$lib/components/sharing-page/shared-album-list-tile.svelte';
diff --git a/web/src/routes/user-settings/+page.server.ts b/web/src/routes/user-settings/+page.server.ts
new file mode 100644
index 000000000..8fe716398
--- /dev/null
+++ b/web/src/routes/user-settings/+page.server.ts
@@ -0,0 +1,18 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+
+export const load: PageServerLoad = async ({ parent }) => {
+	try {
+		const { user } = await parent();
+
+		if (!user) {
+			throw Error('User is not logged in');
+		}
+
+		return {
+			user: user
+		};
+	} catch (e) {
+		throw redirect(302, '/auth/login');
+	}
+};
diff --git a/web/src/routes/user-settings/+page.svelte b/web/src/routes/user-settings/+page.svelte
new file mode 100644
index 000000000..749dd9e96
--- /dev/null
+++ b/web/src/routes/user-settings/+page.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+	import NavigationBar from '$lib/components/shared-components/navigation-bar/navigation-bar.svelte';
+	import SideBar from '$lib/components/shared-components/side-bar/side-bar.svelte';
+	import UserSettingsList from '$lib/components/user-settings-page/user-settings-list.svelte';
+	import type { PageData } from './$types';
+
+	export let data: PageData;
+</script>
+
+<svelte:head>
+	<title>Settings - Immich</title>
+</svelte:head>
+
+<section>
+	<NavigationBar user={data.user} shouldShowUploadButton={false} />
+</section>
+
+<section
+	class="grid grid-cols-[250px_auto] relative pt-[72px] h-screen bg-immich-bg dark:bg-immich-dark-bg"
+>
+	<SideBar />
+
+	<section class="overflow-y-auto ">
+		<div
+			id="user-setting-title"
+			class="pt-10 fixed w-full z-50 bg-immich-bg dark:bg-immich-dark-bg"
+		>
+			<h1 class="text-lg ml-8 mb-4 text-immich-primary dark:text-immich-dark-primary font-medium">
+				User Settings
+			</h1>
+			<hr class="dark:border-immich-dark-gray" />
+		</div>
+
+		<section id="user-setting-content" class="pt-[85px] flex place-content-center">
+			<section class="w-[800px] pt-5">
+				<UserSettingsList user={data.user} />
+			</section>
+		</section>
+	</section>
+</section>