diff --git a/src/components/layout/admin/main-admin.layout.tsx b/src/components/layout/admin/main-admin.layout.tsx
index 515896bc8..8423e6d7c 100644
--- a/src/components/layout/admin/main-admin.layout.tsx
+++ b/src/components/layout/admin/main-admin.layout.tsx
@@ -108,14 +108,14 @@ export const MainLayout = ({ children }: MainLayoutProps) => {
         />
       </NavLink>
       <NavLink
-        label="Preferences"
+        label="Settings"
         icon={
           <ThemeIcon size="md" variant="light" color="red">
             <IconSettings2 size="1rem" />
           </ThemeIcon>
         }
         component={Link}
-        href="/manage/preferences"
+        href="/manage/settings"
       />
       <NavLink
         label="Help"
diff --git a/src/components/layout/new-header/AvatarMenu.tsx b/src/components/layout/new-header/AvatarMenu.tsx
index 3b4257faf..dd0a934b3 100644
--- a/src/components/layout/new-header/AvatarMenu.tsx
+++ b/src/components/layout/new-header/AvatarMenu.tsx
@@ -43,10 +43,10 @@ export const AvatarMenu = () => {
               <>
                 <Menu.Item
                   component={Link}
-                  href="/manage/preferences"
+                  href="/user/preferences"
                   icon={<IconUserCog size="1rem" />}
                 >
-                  Settings
+                  User preferences
                 </Menu.Item>
                 <Menu.Item component={Link} href="/board" icon={<IconDashboard size="1rem" />}>
                   Default Dashboard
diff --git a/src/pages/manage/index.tsx b/src/pages/manage/index.tsx
index 98c301ab2..92a4dbfa9 100644
--- a/src/pages/manage/index.tsx
+++ b/src/pages/manage/index.tsx
@@ -86,7 +86,7 @@ const ManagementPage = () => {
             </Group>
           </Card>
         </UnstyledButton>
-        <UnstyledButton component={Link} href="/manage/preferences">
+        <UnstyledButton component={Link} href="/user/preferences">
           <Card className={classes.quickActionCard}>
             <Group spacing={30} noWrap>
               <Stack spacing={0}>
diff --git a/src/pages/manage/settings/index.tsx b/src/pages/manage/settings/index.tsx
new file mode 100644
index 000000000..715e39224
--- /dev/null
+++ b/src/pages/manage/settings/index.tsx
@@ -0,0 +1,18 @@
+import { Title, Text } from '@mantine/core';
+import { MainLayout } from '~/components/layout/admin/main-admin.layout';
+import { CommonHeader } from '~/components/layout/common-header';
+
+const SettingsPage = () => {
+  return (
+    <MainLayout>
+      <CommonHeader>
+        <title>Settings • Homarr</title>
+      </CommonHeader>
+
+      <Title>Settings</Title>
+      <Text>Coming soon!</Text>
+    </MainLayout>
+  );
+};
+
+export default SettingsPage;
diff --git a/src/pages/manage/preferences.tsx b/src/pages/user/preferences.tsx
similarity index 100%
rename from src/pages/manage/preferences.tsx
rename to src/pages/user/preferences.tsx
diff --git a/src/server/api/routers/user.ts b/src/server/api/routers/user.ts
index 402e2e505..48abab753 100644
--- a/src/server/api/routers/user.ts
+++ b/src/server/api/routers/user.ts
@@ -182,6 +182,9 @@ export const userRouter = createTRPCRouter({
           email: input.email,
           password: hashedPassword,
           salt: salt,
+          settings: {
+             create: {}
+          },
         },
       });
     }),