diff --git a/src/pages/manage/boards/index.tsx b/src/pages/manage/boards/index.tsx
index 7335100c7..53cd19c5d 100644
--- a/src/pages/manage/boards/index.tsx
+++ b/src/pages/manage/boards/index.tsx
@@ -19,6 +19,8 @@ import {
   IconDotsVertical,
   IconFolderFilled,
   IconPlus,
+  IconStar,
+  IconStarFilled,
   IconTrash,
 } from '@tabler/icons-react';
 import Head from 'next/head';
@@ -69,14 +71,28 @@ const BoardsPage = () => {
             <Card key={index} shadow="sm" padding="lg" radius="md" pos="relative" withBorder>
               <LoadingOverlay visible={deletingDashboards.includes(board.name)} />
 
-              <Text weight={500} mb="xs">
-                {board.name}
-              </Text>
-
-              <Group mb="xl">
-                <Badge leftSection={<IconFolderFilled size=".7rem" />} color="pink" variant="light">
-                  Filesystem
-                </Badge>
+              <Group mb="xl" position="apart" noWrap>
+                <Text weight={500} mb="xs">
+                  {board.name}
+                </Text>
+                <Group spacing="xs" noWrap>
+                  <Badge
+                    leftSection={<IconFolderFilled size=".7rem" />}
+                    color="pink"
+                    variant="light"
+                  >
+                    Filesystem
+                  </Badge>
+                  {board.isDefaultForUser && (
+                    <Badge
+                      leftSection={<IconStarFilled size=".7rem" />}
+                      color="yellow"
+                      variant="light"
+                    >
+                      Default
+                    </Badge>
+                  )}
+                </Group>
               </Group>
 
               <Stack spacing={3}>
diff --git a/src/pages/user/preferences.tsx b/src/pages/user/preferences.tsx
index 0fc8bc4da..9a5ab67aa 100644
--- a/src/pages/user/preferences.tsx
+++ b/src/pages/user/preferences.tsx
@@ -1,4 +1,4 @@
-import { Button, Group, Select, Stack, Text, Title } from '@mantine/core';
+import { Button, Group, LoadingOverlay, Select, Stack, Text, Title } from '@mantine/core';
 import { createFormContext } from '@mantine/form';
 import type { InferGetServerSidePropsType } from 'next';
 import { GetServerSidePropsContext } from 'next';
@@ -8,6 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 import { AccessibilitySettings } from '~/components/User/Preferences/AccessibilitySettings';
 import { ManageLayout } from '~/components/layout/Templates/ManageLayout';
+import { sleep } from '~/tools/client/time';
 import { languages } from '~/tools/language';
 import { getServerSideTranslations } from '~/tools/server/getServerSideTranslations';
 import { manageNamespaces } from '~/tools/server/translation-namespaces';
@@ -65,15 +66,23 @@ const SettingsComponent = ({
     validateInputOnChange: true,
   });
 
-  const { mutate } = api.user.updateSettings.useMutation();
+  const context = api.useContext();
+  const { mutate, isLoading } = api.user.updateSettings.useMutation({
+    onSettled: () => {
+      void context.boards.all.invalidate();
+    }
+  });
 
   const handleSubmit = () => {
-    mutate(form.values);
+    sleep(500).then(() => {
+      mutate(form.values);
+    });
   };
 
   return (
     <FormProvider form={form}>
-      <form onSubmit={form.onSubmit(handleSubmit)}>
+      <form style={{ position: 'relative' }} onSubmit={form.onSubmit(handleSubmit)}>
+        <LoadingOverlay visible={isLoading} overlayBlur={2} />
         <Stack spacing={5}>
           <Title order={2} size="lg">
             {t('boards.title')}
diff --git a/src/server/api/routers/board.ts b/src/server/api/routers/board.ts
index bdbcd04b6..99ecb58fa 100644
--- a/src/server/api/routers/board.ts
+++ b/src/server/api/routers/board.ts
@@ -1,11 +1,19 @@
 import fs from 'fs';
-import { getFrontendConfig } from '~/tools/config/getFrontendConfig';
 
 import { createTRPCRouter, publicProcedure } from '../trpc';
 
+import { getFrontendConfig } from '~/tools/config/getFrontendConfig';
+
 export const boardRouter = createTRPCRouter({
   all: publicProcedure.query(async ({ ctx }) => {
     const files = fs.readdirSync('./data/configs').filter((file) => file.endsWith('.json'));
+
+    const userSettings = await ctx.prisma.userSettings.findUniqueOrThrow({
+      where: {
+        userId: ctx.session?.user.id
+      }
+    });
+
     return await Promise.all(
       files.map(async (file) => {
         const name = file.replace('.json', '');
@@ -17,7 +25,8 @@ export const boardRouter = createTRPCRouter({
           name: name,
           countApps: countApps,
           countWidgets: config.widgets.length,
-          countCategories: config.categories.length
+          countCategories: config.categories.length,
+          isDefaultForUser: name === userSettings.defaultBoard
         };
       })
     );
diff --git a/src/server/api/routers/user.ts b/src/server/api/routers/user.ts
index 9199c8a0a..182b0297a 100644
--- a/src/server/api/routers/user.ts
+++ b/src/server/api/routers/user.ts
@@ -1,6 +1,12 @@
 import { TRPCError } from '@trpc/server';
+
 import bcrypt from 'bcrypt';
+
 import { z } from 'zod';
+
+import { createTRPCRouter, protectedProcedure, publicProcedure } from '../trpc';
+import { COOKIE_COLOR_SCHEME_KEY, COOKIE_LOCALE_KEY } from '../../../../data/constants';
+
 import { hashPassword } from '~/utils/security';
 import {
   colorSchemeParser,
@@ -9,9 +15,6 @@ import {
   updateSettingsValidationSchema,
 } from '~/validations/user';
 
-import { COOKIE_COLOR_SCHEME_KEY, COOKIE_LOCALE_KEY } from '../../../../data/constants';
-import { createTRPCRouter, protectedProcedure, publicProcedure } from '../trpc';
-
 export const userRouter = createTRPCRouter({
   createFromInvite: publicProcedure
     .input(
@@ -151,7 +154,8 @@ export const userRouter = createTRPCRouter({
             update: {
               disablePingPulse: input.disablePingPulse,
               replacePingWithIcons: input.replaceDotsWithIcons,
-              language: input.language,
+              defaultBoard: input.defaultBoard,
+              language: input.language
             },
           },
         },