diff --git a/.env.local-dev.example b/.env.local-dev.example
index e4a5af113c..065eeca33f 100644
--- a/.env.local-dev.example
+++ b/.env.local-dev.example
@@ -51,9 +51,11 @@ SYNC_TEMPLATES_ON_STARTUP=false
 MIGRATE_ON_STARTUP=false
 
 # =============================================================================
-# Optional: Email (use console backend for local dev)
+# Email (mailhog via Docker - intercepts all emails)
 # =============================================================================
-# EMAIL_BACKEND=django.core.mail.backends.console.EmailBackend
+# Mailhog web UI: http://localhost:8025
+EMAIL_HOST=localhost
+EMAIL_PORT=1025
 
 # =============================================================================
 # Optional: Celery
diff --git a/.gitignore b/.gitignore
index c7bcd7646a..ecb13560ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ typings/
 
 # nuxt.js build output
 .nuxt
+.nuxtrc
 
 # Nuxt generate
 dist
diff --git a/backend/src/baserow/config/settings/dev.py b/backend/src/baserow/config/settings/dev.py
index c71b5ed367..db3b3c4434 100755
--- a/backend/src/baserow/config/settings/dev.py
+++ b/backend/src/baserow/config/settings/dev.py
@@ -57,8 +57,9 @@
 
 CELERY_EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 EMAIL_USE_TLS = False
-EMAIL_HOST = "mailhog"
-EMAIL_PORT = 1025
+# Use localhost for local dev (just dev up), mailhog for docker dev (just dc-dev up)
+EMAIL_HOST = os.getenv("EMAIL_HOST", "mailhog")
+EMAIL_PORT = int(os.getenv("EMAIL_PORT", "1025"))
 
 BASEROW_MAX_ROW_REPORT_ERROR_COUNT = 10  # To trigger this exception easily
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index f76b05d5ca..43445b4eec 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -20,6 +20,9 @@ services:
   caddy:
     volumes:
       - $PWD/Caddyfile.dev:/etc/caddy/Caddyfile
+      # For local development, mount the local backend/media folder so Caddy can
+      # serve files uploaded by the native backend process.
+      - $PWD/backend/media:/baserow/media
 
   backend:
     image: baserow_backend:dev
@@ -192,6 +195,7 @@ services:
     logging:
       driver: "none" # disable saving logs
     ports:
+      - "${HOST_PUBLISH_IP:-127.0.0.1}:1025:1025" # smtp
       - "8025:8025" # web ui
     networks:
       local:
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/module.js b/enterprise/web-frontend/modules/baserow_enterprise/module.js
index 5ff3b05bf4..b278ecc851 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/module.js
+++ b/enterprise/web-frontend/modules/baserow_enterprise/module.js
@@ -6,25 +6,7 @@ import {
   extendPages,
 } from 'nuxt/kit'
 import { routes, rootChildRoutes } from './routes'
-
-import en from './locales/en.json'
-import fr from './locales/fr.json'
-import nl from './locales/nl.json'
-import de from './locales/de.json'
-import es from './locales/es.json'
-import it from './locales/it.json'
-import pl from './locales/pl.json'
-import ko from './locales/ko.json'
-
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-]
+import { locales } from '../../../../web-frontend/config/locales.js'
 
 export default defineNuxtModule({
   meta: {
@@ -65,8 +47,15 @@ export default defineNuxtModule({
         }
       })
 
-      // Add top-level routes (login pages, etc.)
-      pages.push(...routes)
+      // Add login pages as children of login-pages (inherit login layout)
+      const loginPagesRoute = pages.find((route) => route.name === 'login-pages')
+      if (loginPagesRoute) {
+        routes.forEach((route) => {
+          if (!loginPagesRoute.children.find(({ name }) => name === route.name)) {
+            loginPagesRoute.children.push(route)
+          }
+        })
+      }
     })
 
     nuxt.hook('i18n:registerModule', (register) => {
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginError.vue b/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginError.vue
index 2de0f30770..204488c355 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginError.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginError.vue
@@ -26,24 +26,30 @@
   </div>
 </template>
 
-<script>
-export default {
+<script setup>
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
+import { useI18n } from 'vue-i18n'
+
+definePageMeta({
   layout: 'login',
-  asyncData({ route, i18n }) {
-    const { error } = route.query
-    const errorMessageI18nKey = `loginError.${error}`
-    let errorMessage = i18n.t('loginError.defaultErrorMessage')
-    if (i18n.te(errorMessageI18nKey)) {
-      errorMessage = i18n.t(`loginError.${error}`)
-    }
-    return {
-      errorMessage,
-    }
-  },
-  head() {
-    return {
-      title: this.$t('loginError.title'),
-    }
-  },
-}
+})
+
+const route = useRoute()
+const { t, te } = useI18n()
+
+// Compute error message based on query param
+const errorMessage = computed(() => {
+  const { error } = route.query
+  const errorMessageI18nKey = `loginError.${error}`
+  if (te(errorMessageI18nKey)) {
+    return t(errorMessageI18nKey)
+  }
+  return t('loginError.defaultErrorMessage')
+})
+
+// Head
+useHead({
+  title: t('loginError.title'),
+})
 </script>
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue b/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue
index 2af025caf6..bf34b223bd 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/pages/login/loginWithSAML.vue
@@ -20,14 +20,14 @@
           class="mb-24"
         >
           <FormInput
-            ref="email"
-            v-model="values.email"
+            ref="emailInput"
+            v-model="formData.email"
             type="email"
             size="large"
             :placeholder="$t('login.emailPlaceholder')"
             :error="fieldHasErrors('email') || loginRequestError"
-            @input="loginRequestError = null"
-            @blur="v$.values.email.$touch"
+            @input="loginRequestError = false"
+            @blur="v$.email.$touch"
           ></FormInput>
 
           <template #error>
@@ -72,132 +72,169 @@
   </div>
 </template>
 
-<script>
-import { mapGetters } from 'vuex'
+<script setup>
+import { ref, reactive, computed, onMounted } from 'vue'
+import { useStore } from 'vuex'
+import { useRoute } from 'vue-router'
 import { useVuelidate } from '@vuelidate/core'
-import { reactive } from 'vue'
-import decamelize from 'decamelize'
 import { required, email } from '@vuelidate/validators'
-import form from '@baserow/modules/core/mixins/form'
-import error from '@baserow/modules/core/mixins/error'
-import workspaceInvitationToken from '@baserow/modules/core/mixins/workspaceInvitationToken'
+import decamelize from 'decamelize'
+
 import { SamlAuthProviderType } from '@baserow_enterprise/authProviderTypes'
 import samlAuthProviderService from '@baserow_enterprise/services/samlAuthProvider'
+import WorkspaceService from '@baserow/modules/core/services/workspace'
 
-export default {
-  mixins: [form, error],
+definePageMeta({
   layout: 'login',
-  setup() {
-    const values = reactive({
-      values: {
-        email: '',
-      },
-    })
+})
 
-    const rules = {
-      values: {
-        email: { required, email },
-      },
-    }
+const store = useStore()
+const route = useRoute()
+const { $client } = useNuxtApp()
+
+// Refs
+const emailInput = ref(null)
+const loading = ref(false)
+const loginRequestError = ref(false)
+const redirectImmediately = ref(false)
+const redirectUrl = ref(null)
+
+// Form data
+const formData = reactive({
+  email: '',
+})
+
+// Vuelidate
+const rules = {
+  email: { required, email },
+}
+
+const v$ = useVuelidate(rules, formData, { $lazy: true })
+
+// Computed
+const passwordLoginEnabled = computed(
+  () => store.getters['authProvider/getPasswordLoginEnabled']
+)
+
+// Methods
+const fieldHasErrors = (field) => {
+  return v$.value[field].$error
+}
 
-    return {
-      v$: useVuelidate(rules, values, { $lazy: true }),
-      values: values.values,
+const getRedirectUrlWithValidQueryParams = (url) => {
+  const parsedUrl = new URL(url)
+  for (const [key, value] of Object.entries(route.query)) {
+    if (['language', 'workspaceInvitationToken'].includes(key)) {
+      parsedUrl.searchParams.append(decamelize(key), value)
     }
-  },
-  async asyncData({ app, redirect, store, route }) {
+  }
+  return parsedUrl.toString()
+}
+
+const login = async () => {
+  v$.value.$touch()
+  loginRequestError.value = false
+
+  if (v$.value.$invalid) {
+    emailInput.value?.$el?.focus()
+    return
+  }
+
+  loading.value = true
+
+  const { original } = route.query
+  try {
+    const { data } = await samlAuthProviderService($client).getSamlLoginUrl({
+      email: formData.email,
+      original,
+    })
+    window.location = getRedirectUrlWithValidQueryParams(data.redirect_url)
+  } catch (error) {
+    loginRequestError.value = true
+    loading.value = false
+  }
+}
+
+// Async data fetching
+const { data: asyncData } = await useAsyncData(
+  'saml-login',
+  async () => {
     // the SuperUser must create the account using username and password
     if (store.getters['settings/get'].show_admin_signup_page === true) {
-      return redirect({ name: 'signup' })
+      await navigateTo({ name: 'signup' })
+      return {}
     }
+
     // if this page is accessed directly, load the login options to
     // populate the page with all the authentication providers
     if (!store.getters['authProvider/getLoginOptionsLoaded']) {
       await store.dispatch('authProvider/fetchLoginOptions')
     }
-    const samlLoginOptions = store.getters[
-      'authProvider/getLoginOptionsForType'
-    ](new SamlAuthProviderType().getType())
+
+    const samlLoginOptions =
+      store.getters['authProvider/getLoginOptionsForType'](
+        new SamlAuthProviderType().getType()
+      )
+
     if (!samlLoginOptions) {
-      return redirect({ name: 'login', query: route.query }) // no SAML provider enabled
+      await navigateTo({ name: 'login', query: route.query }) // no SAML provider enabled
+      return {}
     }
+
+    // Fetch workspace invitation if token exists
+    let invitation = null
+    const invitationToken = route.query.workspaceInvitationToken
+    if (invitationToken) {
+      try {
+        const { data } =
+          await WorkspaceService($client).fetchInvitationByToken(invitationToken)
+        invitation = data
+      } catch {}
+    }
+
     // in case the email is not necessary or provided via workspace invitation,
     // redirect the user directly to the SAML provider
-    const { invitation } = await workspaceInvitationToken.asyncData({
-      route,
-      app,
-    })
     if (!samlLoginOptions.domainRequired || invitation?.email) {
       try {
-        const { data } = await samlAuthProviderService(
-          app.$client
-        ).getSamlLoginUrl({
+        const { data } = await samlAuthProviderService($client).getSamlLoginUrl({
           email: invitation?.email,
           original: route.query.original,
         })
-        return { redirectImmediately: true, redirectUrl: data.redirect_url }
+        return {
+          redirectImmediately: true,
+          redirectUrl: data.redirect_url,
+        }
       } catch (error) {
-        return { values: { email: invitation?.email }, loginRequestError: true }
+        return {
+          email: invitation?.email,
+          loginRequestError: true,
+        }
       }
     }
-    return { redirectUrl: samlLoginOptions.redirect_url }
-  },
-  data() {
-    return {
-      loading: false,
-      redirectImmediately: false,
-      loginRequestError: false,
-    }
-  },
-  computed: {
-    ...mapGetters({
-      passwordLoginEnabled: 'authProvider/getPasswordLoginEnabled',
-    }),
-  },
-  mounted() {
-    if (this.redirectImmediately) {
-      window.location.href = this.getRedirectUrlWithValidQueryParams(
-        this.redirectUrl
-      )
-    }
-  },
-  methods: {
-    async login() {
-      this.v$.$touch()
-      this.loginRequestError = false
-      if (this.v$.$invalid) {
-        this.focusOnFirstError()
-        return
-      }
 
-      this.loading = true
-      this.hideError()
+    return { redirectUrl: samlLoginOptions.redirect_url }
+  }
+)
 
-      const { original } = this.$route.query
-      try {
-        const { data } = await samlAuthProviderService(
-          this.$client
-        ).getSamlLoginUrl({
-          email: this.values.email,
-          original,
-        })
-        window.location = this.getRedirectUrlWithValidQueryParams(
-          data.redirect_url
-        )
-      } catch (error) {
-        this.loginRequestError = true
-        this.loading = false
-      }
-    },
-    getRedirectUrlWithValidQueryParams(url) {
-      const parsedUrl = new URL(url)
-      for (const [key, value] of Object.entries(this.$route.query)) {
-        if (['language', 'workspaceInvitationToken'].includes(key)) {
-          parsedUrl.searchParams.append(decamelize(key), value)
-        }
-      }
-      return parsedUrl.toString()
-    },
-  },
+// Apply async data results
+if (asyncData.value?.redirectImmediately) {
+  redirectImmediately.value = true
+  redirectUrl.value = asyncData.value.redirectUrl
+}
+if (asyncData.value?.redirectUrl) {
+  redirectUrl.value = asyncData.value.redirectUrl
 }
+if (asyncData.value?.email) {
+  formData.email = asyncData.value.email
+}
+if (asyncData.value?.loginRequestError) {
+  loginRequestError.value = true
+}
+
+// Mounted
+onMounted(() => {
+  if (redirectImmediately.value && redirectUrl.value) {
+    window.location.href = getRedirectUrlWithValidQueryParams(redirectUrl.value)
+  }
+})
 </script>
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/routes.js b/enterprise/web-frontend/modules/baserow_enterprise/routes.js
index a4bbad331a..85b527efa8 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/routes.js
+++ b/enterprise/web-frontend/modules/baserow_enterprise/routes.js
@@ -19,7 +19,7 @@ export const rootChildRoutes = [
   },
 ]
 
-// Routes at the top level (login pages, etc.)
+// Login pages (children of login-pages route, inherit login layout)
 export const routes = [
   {
     name: 'login-saml',
diff --git a/premium/web-frontend/modules/baserow_premium/module.js b/premium/web-frontend/modules/baserow_premium/module.js
index 8538b851e5..e1fc8e5dc2 100644
--- a/premium/web-frontend/modules/baserow_premium/module.js
+++ b/premium/web-frontend/modules/baserow_premium/module.js
@@ -5,25 +5,7 @@ import {
   extendPages,
 } from 'nuxt/kit'
 import { routes } from './routes'
-
-/*import en from './locales/en.json'
-import fr from './locales/fr.json'
-import nl from './locales/nl.json'
-import de from './locales/de.json'
-import es from './locales/es.json'
-import it from './locales/it.json'
-import pl from './locales/pl.json'
-import ko from './locales/ko.json'*/
-
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-]
+import { locales } from '../../../../web-frontend/config/locales.js'
 
 export default defineNuxtModule({
   meta: {
diff --git a/premium/web-frontend/modules/baserow_premium/pages/admin/license.vue b/premium/web-frontend/modules/baserow_premium/pages/admin/license.vue
index 6a5e519418..89df94d4f6 100644
--- a/premium/web-frontend/modules/baserow_premium/pages/admin/license.vue
+++ b/premium/web-frontend/modules/baserow_premium/pages/admin/license.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="layout__col-2-scroll layout__col-2-scroll--white-background">
-    <div class="license-detail">
+    <div v-if="license" class="license-detail">
       <h1>
         {{ $t('license.title', { name: licenseType.getName() }) }}
       </h1>
@@ -184,7 +184,7 @@
               </template>
             </i18n-t>
 
-            <Button type="danger" @click="$refs.disconnectModal.show()">
+            <Button type="danger" @click="disconnectModal?.show()">
               {{ $t('license.disconnectLicense') }}
             </Button>
             <DisconnectLicenseModal
@@ -198,7 +198,7 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import moment from '@baserow/modules/core/moment'
 import { notifyIf } from '@baserow/modules/core/utils/error'
 import LicenseService from '@baserow_premium/services/license'
@@ -206,65 +206,68 @@ import DisconnectLicenseModal from '@baserow_premium/components/license/Disconne
 import ManualLicenseSeatsForm from '@baserow_premium/components/license/ManualLicenseSeatForm'
 import AutomaticLicenseSeats from '@baserow_premium/components/license/AutomaticLicenseSeats'
 
-export default {
-  components: {
-    DisconnectLicenseModal,
-    ManualLicenseSeatsForm,
-    AutomaticLicenseSeats,
-  },
+definePageMeta({
   layout: 'app',
   middleware: 'staff',
-  async asyncData({ params, app, error }) {
-    try {
-      const { data } = await LicenseService(app.$client).fetch(params.id)
-      return { license: data }
-    } catch {
-      return error({
-        statusCode: 404,
-        message: 'The license was not found.',
-      })
-    }
-  },
-  data() {
-    return {
-      user: null,
-      checkLoading: false,
-    }
-  },
-  computed: {
-    licenseType() {
-      return this.$registry.get('license', this.license.product_code)
-    },
-    licenseFeatureDescription() {
-      return this.licenseType.getFeaturesDescription()
-    },
-  },
-  methods: {
-    localDateTime(timestamp) {
-      if (timestamp === null) {
-        return ''
-      }
+})
+
+const route = useRoute()
+const router = useRouter()
+const { $client, $registry } = useNuxtApp()
+
+// Fetch license data
+const { data } = await useAsyncData(`license-${route.params.id}`, async () => {
+  try {
+    const { data: licenseData } = await LicenseService($client).fetch(
+      route.params.id
+    )
+    return licenseData
+  } catch {
+    throw createError({
+      statusCode: 404,
+      message: 'The license was not found.',
+    })
+  }
+})
+
+const license = computed(() => data.value)
+
+const checkLoading = ref(false)
+const disconnectModal = ref(null)
 
-      return moment.utc(timestamp).local().format('ll LT')
-    },
-    async check() {
-      this.checkLoading = true
+const licenseType = computed(() => {
+  if (!license.value) return null
+  return $registry.get('license', license.value.product_code)
+})
 
-      try {
-        const { data, status } = await LicenseService(this.$client).check(
-          this.license.id
-        )
-        if (status === 204) {
-          this.$router.push({ name: 'admin-licenses' })
-        } else {
-          this.license = data
-        }
-      } catch (error) {
-        notifyIf(error)
-      }
+const licenseFeatureDescription = computed(() => {
+  if (!licenseType.value) return []
+  return licenseType.value.getFeaturesDescription()
+})
+
+function localDateTime(timestamp) {
+  if (timestamp === null) {
+    return ''
+  }
+  return moment.utc(timestamp).local().format('ll LT')
+}
+
+async function check() {
+  checkLoading.value = true
+
+  try {
+    const { data: responseData, status } = await LicenseService($client).check(
+      license.value.id
+    )
+    if (status === 204) {
+      router.push({ name: 'admin-licenses' })
+    } else {
+      data.value = responseData
+    }
+  } catch (error) {
+    notifyIf(error)
+  }
 
-      this.checkLoading = false
-    },
-  },
+  checkLoading.value = false
 }
 </script>
diff --git a/web-frontend/config/locales.js b/web-frontend/config/locales.js
new file mode 100644
index 0000000000..85829d3784
--- /dev/null
+++ b/web-frontend/config/locales.js
@@ -0,0 +1,18 @@
+/**
+ * Shared locales configuration for all Baserow modules.
+ * This is the single source of truth for supported languages.
+ *
+ * To add a new language:
+ * 1. Add the locale entry here
+ * 2. Create the corresponding .json translation files in each module's locales/ directory
+ */
+export const locales = [
+  { code: 'en', name: 'English', file: 'en.json' },
+  { code: 'fr', name: 'Français', file: 'fr.json' },
+  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
+  { code: 'de', name: 'Deutsch', file: 'de.json' },
+  { code: 'es', name: 'Español', file: 'es.json' },
+  { code: 'it', name: 'Italiano', file: 'it.json' },
+  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
+  { code: 'ko', name: '한국어', file: 'ko.json' },
+]
diff --git a/web-frontend/config/nuxt.config.base.ts b/web-frontend/config/nuxt.config.base.ts
index 37e2a919b8..c7ffb48e97 100644
--- a/web-frontend/config/nuxt.config.base.ts
+++ b/web-frontend/config/nuxt.config.base.ts
@@ -2,6 +2,7 @@ import path from 'node:path'
 import { defineNuxtConfig } from 'nuxt/config'
 import svgLoader from 'vite-svg-loader'
 import { nodePolyfills } from 'vite-plugin-node-polyfills'
+import { locales } from './locales.js'
 
 function baserowModuleConfig(
   premiumBase = '../premium/web-frontend',
@@ -49,16 +50,6 @@ function baserowModuleConfig(
 
 const baserow = baserowModuleConfig()
 
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-]
-
 export default defineNuxtConfig({
   compatibilityDate: '2025-07-15',
   alias: {
@@ -100,6 +91,13 @@ export default defineNuxtConfig({
     ssr: {
       noExternal: ['vue-chartjs', 'chart.js'],
     },
+    server: {
+      sourcemapIgnoreList: (sourcePath) => sourcePath.includes('node_modules'),
+    },
+    optimizeDeps: {
+      // Pre-bundle moment-guess to avoid missing source map warning
+      include: ['moment-guess'],
+    },
   },
   buildDir: process.env.NUXT_BUILD_DIR || '.nuxt',
   build: {
diff --git a/web-frontend/config/nuxt.config.test.ts b/web-frontend/config/nuxt.config.test.ts
index cff5a15393..138cc19408 100644
--- a/web-frontend/config/nuxt.config.test.ts
+++ b/web-frontend/config/nuxt.config.test.ts
@@ -1,6 +1,26 @@
+/**
+ * Test Nuxt configuration
+ *
+ * We use a direct import rather than `extends: ['./nuxt.config.base.ts']` because
+ * Nuxt 3's `extends` mechanism is designed for Nuxt layers (directories containing
+ * their own nuxt.config.ts, app.vue, pages/, etc.), not for importing individual
+ * config files directly.
+ *
+ * When pointing `extends` to a .ts file, Nuxt shows:
+ *   "WARN Cannot extend config from ./nuxt.config.base.ts"
+ *
+ * By using a standard ES module import and defu merge, we achieve the same result reliably.
+ */
 import { defineNuxtConfig } from 'nuxt/config'
+import defu from 'defu'
+import baseConfig from './nuxt.config.base.ts'
 
-export default defineNuxtConfig({
-  extends: ['./config/nuxt.config.base.ts'],
-  modules: ['@nuxt/test-utils/module'],
-})
+export default defineNuxtConfig(
+  defu(
+    {
+      // Test-specific configuration
+      modules: ['@nuxt/test-utils/module'],
+    },
+    baseConfig
+  )
+)
diff --git a/web-frontend/docker/docker-entrypoint.sh b/web-frontend/docker/docker-entrypoint.sh
index 5675092ab2..1ebfac25b4 100755
--- a/web-frontend/docker/docker-entrypoint.sh
+++ b/web-frontend/docker/docker-entrypoint.sh
@@ -14,6 +14,7 @@ nuxt-dev                : Start a normal nuxt development server
 nuxt-dev-with-storybook : Start nuxt dev + storybook in parallel
 nuxt                    : Start a non-dev prod ready nuxt server
 nuxt-local              : Start a non-dev prod ready nuxt server using the preset local config
+nuxt-prepare            : Prepare nuxt (generate .nuxt directory)
 storybook-dev           : Start a storybook dev server
 bash                    : Start a bash shell
 build-local             : Triggers a nuxt re-build of Baserow's web-frontend.
@@ -96,6 +97,10 @@ case "$1" in
       setup_additional_modules
       exec ./node_modules/.bin/nuxt start --hostname "${BASEROW_WEBFRONTEND_BIND_ADDRESS:-0.0.0.0}" --port "$BASEROW_WEBFRONTEND_PORT" --config-file ./config/nuxt.config.local.ts "${@:2}"
     ;;
+    nuxt-prepare)
+      setup_additional_modules
+      exec ./node_modules/.bin/nuxt prepare "${@:2}"
+    ;;
     nuxt-dev-with-storybook)
       startup_plugin_setup
       setup_additional_modules
diff --git a/web-frontend/modules/automation/module.js b/web-frontend/modules/automation/module.js
index 0c8ba8d686..4780193bc9 100644
--- a/web-frontend/modules/automation/module.js
+++ b/web-frontend/modules/automation/module.js
@@ -5,17 +5,7 @@ import {
   extendPages,
 } from 'nuxt/kit'
 import { routes } from './routes'
-
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-  { code: 'ko', name: '한국어', file: 'ko.json' },
-]
+import { locales } from '../../config/locales.js'
 
 export default defineNuxtModule({
   meta: {
diff --git a/web-frontend/modules/builder/module.js b/web-frontend/modules/builder/module.js
index a87c021071..771c197a66 100644
--- a/web-frontend/modules/builder/module.js
+++ b/web-frontend/modules/builder/module.js
@@ -7,17 +7,7 @@ import {
   addRouteMiddleware,
 } from 'nuxt/kit'
 import { routes } from './routes'
-
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-  { code: 'ko', name: '한국어', file: 'ko.json' },
-]
+import { locales } from '../../config/locales.js'
 
 export default defineNuxtModule({
   meta: {
diff --git a/web-frontend/modules/core/components/auth/Login.vue b/web-frontend/modules/core/components/auth/Login.vue
index 7670a757b5..3b13d12d95 100644
--- a/web-frontend/modules/core/components/auth/Login.vue
+++ b/web-frontend/modules/core/components/auth/Login.vue
@@ -53,6 +53,7 @@
             settings.allow_reset_password && !passwordLoginHidden
           "
           @success="success"
+          @invitation-accepted="invitationAccepted"
           @two-factor-auth="setTwoFactorRequired"
           @email-not-verified="emailNotVerified"
         />
@@ -184,6 +185,21 @@ export default {
       }
       this.$emit('success')
     },
+    async invitationAccepted(workspace) {
+      if (this.redirectOnSuccess) {
+        // Clear workspace loaded state so it gets refetched on next page
+        this.$store.commit('workspace/SET_LOADED', false)
+        this.$store.commit('application/SET_LOADED', false)
+        // Redirect to the specific workspace
+        await this.$router.push({
+          name: 'workspace',
+          params: { workspaceId: workspace.id },
+        })
+        await pageFinished()
+        await nextTick()
+      }
+      this.$emit('success')
+    },
     emailNotVerified(email) {
       this.displayEmailNotVerified = true
       this.emailToVerify = email
diff --git a/web-frontend/modules/core/components/auth/PasswordLogin.vue b/web-frontend/modules/core/components/auth/PasswordLogin.vue
index 8bd1a9aaaa..031a1e188f 100644
--- a/web-frontend/modules/core/components/auth/PasswordLogin.vue
+++ b/web-frontend/modules/core/components/auth/PasswordLogin.vue
@@ -2,17 +2,14 @@
   <div>
     <Alert v-if="invitation !== null" type="info-primary">
       <template #title>{{ $t('invitationTitle') }}</template>
-      {{ $t('invitationMessage').replace('{invitedBy}',
-      `<strong>${invitation.invited_by}</strong>`).replace('{workspace}',
-      `<strong>${invitation.workspace}</strong>`) }}
-      <!--i18n path="invitationMessage" tag="p">
+      <i18n-t keypath="invitationMessage" tag="span">
         <template #invitedBy>
           <strong>{{ invitation.invited_by }}</strong>
         </template>
         <template #workspace>
           <strong>{{ invitation.workspace }}</strong>
         </template>
-      </!--i18n-->
+      </i18n-t>
     </Alert>
     <Error :error="error"></Error>
     <form @submit.prevent="login">
@@ -116,7 +113,7 @@ export default {
       default: true,
     },
   },
-  emits: ['email-not-verified', 'success', 'two-factor-auth'],
+  emits: ['email-not-verified', 'success', 'two-factor-auth', 'invitation-accepted'],
   setup() {
     const values = reactive({
       values: {
@@ -212,13 +209,19 @@ export default {
 
         // If there is an invitation we can immediately accept that one after the user
         // successfully signs in.
+        let acceptedWorkspace = null
         if (this.invitation?.email === this.values.email) {
-          await WorkspaceService(this.$client).acceptInvitation(
-            this.invitation.id
-          )
+          const { data: workspace } = await WorkspaceService(
+            this.$client
+          ).acceptInvitation(this.invitation.id)
+          acceptedWorkspace = workspace
         }
         this.$i18n.setLocale(data.language)
-        this.$emit('success')
+        if (acceptedWorkspace) {
+          this.$emit('invitation-accepted', acceptedWorkspace)
+        } else {
+          this.$emit('success')
+        }
       } catch (error) {
         if (error.handler) {
           const response = error.handler.response
diff --git a/web-frontend/modules/core/components/sidebar/SidebarUserContext.vue b/web-frontend/modules/core/components/sidebar/SidebarUserContext.vue
index 2fd9e596ff..93f283942e 100644
--- a/web-frontend/modules/core/components/sidebar/SidebarUserContext.vue
+++ b/web-frontend/modules/core/components/sidebar/SidebarUserContext.vue
@@ -49,7 +49,7 @@
           </div>
         </a>
       </li>
-      <li class="select__item">
+      <li v-if="$hasPermission('create_workspace')" class="select__item">
         <a class="select__item-link" @click="$refs.createWorkspaceModal.show()">
           <div class="select__item-name">
             <ButtonIcon
diff --git a/web-frontend/modules/core/module.js b/web-frontend/modules/core/module.js
index 8606832cb3..621197e249 100644
--- a/web-frontend/modules/core/module.js
+++ b/web-frontend/modules/core/module.js
@@ -25,28 +25,10 @@ import { createRequire } from 'node:module'
 import head from './head'
 // import { routes as customRoutes } from './routes'
 
-/*import en from './locales/en.json'
-import fr from './locales/fr.json'
-import nl from './locales/nl.json'
-import de from './locales/de.json'
-import es from './locales/es.json'
-import it from './locales/it.json'
-import pl from './locales/pl.json'
-import ko from './locales/ko.json'*/
+import { locales } from '../../config/locales.js'
 
 const require = createRequire(import.meta.url)
 
-// TODO MIG share that for all modules
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-]
-
 const langDir = '../../locales'
 export default defineNuxtModule({
   meta: {
diff --git a/web-frontend/modules/core/pages/dashboard.vue b/web-frontend/modules/core/pages/dashboard.vue
index ebba792d4d..30b3257768 100644
--- a/web-frontend/modules/core/pages/dashboard.vue
+++ b/web-frontend/modules/core/pages/dashboard.vue
@@ -57,6 +57,7 @@ definePageMeta({
   middleware: [
     'settings',
     'authenticated',
+    'impersonate',
     'workspacesAndApplications',
     'pendingJobs',
   ],
diff --git a/web-frontend/modules/core/pages/login.vue b/web-frontend/modules/core/pages/login.vue
index f21db996de..3e76888b6d 100644
--- a/web-frontend/modules/core/pages/login.vue
+++ b/web-frontend/modules/core/pages/login.vue
@@ -34,23 +34,26 @@ if (store.getters['settings/get'].show_admin_signup_page === true) {
   await navigateTo({ name: 'dashboard' })
 }
 
-// Data fetching
-const { data } = await useAsyncData('loginData', async () => {
-  // Fetch login options (will populate Vuex store)
-  await store.dispatch('authProvider/fetchLoginOptions')
-  // Logic from workspaceInvitationToken mixin
-  const token = route.query.workspaceInvitationToken
-  let invitation = null
-  if (token) {
-    try {
-      const { data } = await WorkspaceService(
-        app.$client
-      ).fetchInvitationByToken(token)
-      invitation = data
-    } catch {}
+// Data fetching - use token in key to avoid caching issues
+const invitationToken = route.query.workspaceInvitationToken
+const { data } = await useAsyncData(
+  `loginData-${invitationToken || 'none'}`,
+  async () => {
+    // Fetch login options (will populate Vuex store)
+    await store.dispatch('authProvider/fetchLoginOptions')
+    // Logic from workspaceInvitationToken mixin
+    let invitation = null
+    if (invitationToken) {
+      try {
+        const { data } = await WorkspaceService(
+          app.$client
+        ).fetchInvitationByToken(invitationToken)
+        invitation = data
+      } catch {}
+    }
+    return { invitation }
   }
-  return { invitation }
-})
+)
 
 // Head
 useHead({
diff --git a/web-frontend/modules/core/pages/signup.vue b/web-frontend/modules/core/pages/signup.vue
index f0af7591ea..546b1f9b19 100644
--- a/web-frontend/modules/core/pages/signup.vue
+++ b/web-frontend/modules/core/pages/signup.vue
@@ -88,8 +88,9 @@ const displayEmailNotVerified = ref(false)
 const emailToVerify = ref(null)
 
 // Fetch invitation data based on token
+const invitationToken = route.query.workspaceInvitationToken
 const { data: invitation } = await useAsyncData(
-  'workspace-invitation',
+  `signup-invitation-${invitationToken || 'none'}`,
   async () => {
     // Redirect if already authenticated
     if (store.getters['auth/isAuthenticated']) {
@@ -101,11 +102,10 @@ const { data: invitation } = await useAsyncData(
     await store.dispatch('authProvider/fetchLoginOptions')
 
     // Fetch workspace invitation if token exists
-    const token = route.query.workspaceInvitationToken
-    if (token) {
+    if (invitationToken) {
       try {
         const { data } =
-          await WorkspaceService($client).fetchInvitationByToken(token)
+          await WorkspaceService($client).fetchInvitationByToken(invitationToken)
         return data
       } catch {
         return null
diff --git a/web-frontend/modules/core/pages/workspace.vue b/web-frontend/modules/core/pages/workspace.vue
index e5a7a8cbac..0c5bb74b79 100644
--- a/web-frontend/modules/core/pages/workspace.vue
+++ b/web-frontend/modules/core/pages/workspace.vue
@@ -229,7 +229,12 @@ import DashboardVerifyEmail from '@baserow/modules/core/components/dashboard/Das
 import TemplateModal from '@baserow/modules/core/components/template/TemplateModal'
 import DashboardHelp from '@baserow/modules/core/components/dashboard/DashboardHelp'
 
-definePageMeta({ layout: 'app' })
+definePageMeta({
+  layout: 'app',
+  // Note: these middlewares must be explicitly listed because child pages
+  // don't automatically inherit parent middleware in Nuxt 3's page meta
+  middleware: ['authenticated', 'workspacesAndApplications', 'impersonate'],
+})
 
 defineOptions({
   mixins: [editWorkspace],
diff --git a/web-frontend/modules/core/pages/workspaceInvitation.vue b/web-frontend/modules/core/pages/workspaceInvitation.vue
index 8777b41e8b..b79b6e4e94 100644
--- a/web-frontend/modules/core/pages/workspaceInvitation.vue
+++ b/web-frontend/modules/core/pages/workspaceInvitation.vue
@@ -1,35 +1,72 @@
-<script>
+<template>
+  <div></div>
+</template>
+
+<script setup>
 import WorkspaceService from '@baserow/modules/core/services/workspace'
 
-export default {
-  middleware: ['authentication'],
-  async asyncData({ store, params, error, app, redirect }) {
-    const { token } = params
-    let invitation
+const route = useRoute()
+const { $store: store, $client } = useNuxtApp()
+
+const token = route.params.token
+
+// Fetch the invitation data
+const { data: invitation, error } = await useAsyncData(
+  'workspace-invitation',
+  async () => {
+    const { data } =
+      await WorkspaceService($client).fetchInvitationByToken(token)
+    return data
+  }
+)
+
+// Handle error - invitation not found or already accepted
+if (error.value) {
+  // If user is authenticated, redirect to dashboard
+  if (store.getters['auth/isAuthenticated']) {
+    await navigateTo({ name: 'dashboard' }, { replace: true })
+  } else {
+    // Otherwise redirect to login
+    await navigateTo({ name: 'login' }, { replace: true })
+  }
+}
+
+// Handle the invitation after data is fetched
+if (invitation.value) {
+  const inv = invitation.value
 
+  // If the authenticated user has the same email address we can accept the invitation
+  // right away and redirect to the workspace.
+  if (
+    store.getters['auth/isAuthenticated'] &&
+    store.getters['auth/getUsername'] === inv.email
+  ) {
     try {
-      const { data } = await WorkspaceService(
-        app.$client
-      ).fetchInvitationByToken(token)
-      invitation = data
-    } catch {
-      return error({ statusCode: 404, message: 'Invitation not found.' })
-    }
+      // Accept the invitation - returns the workspace data
+      const { data: workspace } =
+        await WorkspaceService($client).acceptInvitation(inv.id)
 
-    // If the authenticated user has the same email access we can accept the invitation
-    // right away and redirect to the dashboard.
-    if (
-      store.getters['auth/isAuthenticated'] &&
-      store.getters['auth/getUsername'] === invitation.email
-    ) {
-      await WorkspaceService(app.$client).acceptInvitation(invitation.id)
-      return redirect({ name: 'dashboard' })
-    }
+      // Clear workspace loaded state so it gets refetched on next page
+      store.commit('workspace/SET_LOADED', false)
+      store.commit('application/SET_LOADED', false)
 
-    // Depending on if the email address already exist we redirect the user to either
-    // the login or redirect page.
-    const name = invitation.email_exists ? 'login' : 'signup'
-    return redirect({ name, query: { workspaceInvitationToken: token } })
-  },
+      // Redirect to the specific workspace
+      await navigateTo(
+        { name: 'workspace', params: { workspaceId: workspace.id } },
+        { replace: true }
+      )
+    } catch {
+      // If accepting fails (e.g., already accepted), redirect to dashboard
+      await navigateTo({ name: 'dashboard' }, { replace: true })
+    }
+  } else {
+    // Depending on if the email address already exists we redirect the user to either
+    // the login or signup page.
+    const name = inv.email_exists ? 'login' : 'signup'
+    await navigateTo(
+      { name, query: { workspaceInvitationToken: token } },
+      { replace: true }
+    )
+  }
 }
 </script>
diff --git a/web-frontend/modules/core/store/auth.js b/web-frontend/modules/core/store/auth.js
index be821c67bf..b1ae0f7861 100644
--- a/web-frontend/modules/core/store/auth.js
+++ b/web-frontend/modules/core/store/auth.js
@@ -140,7 +140,7 @@ export const actions = {
    * Authenticate a user by his email and password.
    */
   async login({ getters, dispatch }, { email, password }) {
-    const { data } = await AuthService(useNuxtApp().$client).login(
+    const { data } = await AuthService(this.$client).login(
       email,
       password
     )
@@ -181,7 +181,7 @@ export const actions = {
       templateId = null,
     }
   ) {
-    const { data } = await AuthService(useNuxtApp().$client).register(
+    const { data } = await AuthService(this.$client).register(
       email,
       name,
       password,
@@ -203,13 +203,14 @@ export const actions = {
    */
   logoff({ getters, dispatch }, { invalidateToken = false }) {
     const refreshToken = getters.refreshToken
+    const $client = this.$client
 
     dispatch('forceLogoff')
 
     if (invalidateToken) {
       // Invalidate the token async because we don't have to wait for that.
       setTimeout(() => {
-        AuthService(useNuxtApp().$client).blacklistToken(refreshToken)
+        AuthService($client).blacklistToken(refreshToken)
       })
     }
   },
@@ -277,7 +278,7 @@ export const actions = {
    * Updates the account information is the authenticated user.
    */
   async update({ getters, commit, dispatch }, values) {
-    const { data } = await AuthService(useNuxtApp().$client).update(values)
+    const { data } = await AuthService(this.$client).update(values)
     dispatch('forceUpdateUserData', { user: data })
     dispatch(
       'workspace/forceUpdateWorkspaceUserAttributes',
@@ -321,7 +322,7 @@ export const actions = {
     commit('SET_USER_SESSION_EXPIRED', value)
   },
   async fetchWorkspaceInvitations({ commit }) {
-    const { data } = await AuthService(useNuxtApp().$client).dashboard()
+    const { data } = await AuthService(this.$client).dashboard()
     commit('SET_WORKSPACE_INVIATIONS', data.workspace_invitations)
     return data.workspace_invitations
   },
@@ -330,7 +331,7 @@ export const actions = {
   },
   async acceptWorkspaceInvitation({ commit }, invitationId) {
     const { data: workspace } = await WorkspaceService(
-      useNuxtApp().$client
+      this.$client
     ).acceptInvitation(invitationId)
     commit('REMOVE_WORKSPACE_INVITATION', invitationId)
     return workspace
@@ -339,7 +340,7 @@ export const actions = {
     commit('REMOVE_WORKSPACE_INVITATION', invitation.id)
   },
   async rejectWorkspaceInvitation({ commit }, invitationId) {
-    await WorkspaceService(useNuxtApp().$client).rejectInvitation(invitationId)
+    await WorkspaceService(this.$client).rejectInvitation(invitationId)
     commit('REMOVE_WORKSPACE_INVITATION', invitationId)
   },
   forceRejectWorkspaceInvitation({ commit }, invitation) {
diff --git a/web-frontend/modules/dashboard/module.js b/web-frontend/modules/dashboard/module.js
index 20fbe74147..88894f12ec 100644
--- a/web-frontend/modules/dashboard/module.js
+++ b/web-frontend/modules/dashboard/module.js
@@ -39,16 +39,7 @@ import {
   extendPages,
 } from 'nuxt/kit'
 import { routes } from './routes'
-
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-]
+import { locales } from '../../config/locales.js'
 
 export default defineNuxtModule({
   meta: {
diff --git a/web-frontend/modules/database/locales/ko.json b/web-frontend/modules/database/locales/ko.json
index f15b175aee..11fabdf57c 100644
--- a/web-frontend/modules/database/locales/ko.json
+++ b/web-frontend/modules/database/locales/ko.json
@@ -146,7 +146,7 @@
         "userFieldNames": "`user_field_names` GET 매개변수를 제공하고 그 값이 다음 중 하나인 경우: `y`, `yes`, `true`, `t`, `on`, `1`, 또는 빈 문자열인 경우, 이 엔드포인트에서 반환되는 필드 이름은 실제 필드 이름이 됩니다.\n\n`user_field_names` GET 매개변수가 제공되지 않거나 위의 값 중 어느 것도 일치하지 않는 경우, 반환되는 모든 필드 이름은 `field_` 뒤에 필드의 ID가 옵니다. 예를 들어 `field_1`은 ID가 `1`인 필드를 나타냅니다.\n\n 또한 `user_field_names`가 설정되면 다른 GET 매개변수 `order_by`, `include` 및 `exclude`의 동작이 변경됩니다. 대신 실제 필드 이름의 쉼표로 구분된 목록을 기대합니다.",
         "search": "제공된 경우 검색 쿼리와 일치하는 데이터가 있는 행만 반환됩니다.",
         "orderBy": "선택적으로 쉼표로 구분된 필드로 행을 정렬할 수 있습니다. 기본적으로 또는 '+'가 앞에 오면 필드는 오름차순(A-Z)으로 정렬되지만, '-'가 앞에 오면 내림차순(Z-A)으로 정렬할 수 있습니다.\n\n #### `user_field_names` 사용 시:\n\n `order_by`는 정렬할 필드 이름의 쉼표로 구분된 목록이어야 합니다. 예를 들어 `order_by=My Field,-My Field 2` GET 매개변수를 제공하면 행은 `My Field`라는 필드로 오름차순으로 정렬됩니다. 일부 필드에 동일한 값이 있는 경우 해당 하위 집합은 `My Field 2`라는 필드로 내림차순으로 정렬됩니다.\n\n `+` 또는 `-`로 시작하는 필드 이름은 명시적으로 다른 `+` 또는 `-`를 앞에 붙여야 합니다. 예: `+-Name`.\n\n 쉼표를 포함하는 필드 이름은 따옴표로 묶어야 합니다: `\"Name ,\"`. 필드 이름에 따옴표가 포함된 경우 `\\` 문자를 사용하여 이스케이프해야 합니다. 예: `Name \\\"`.\n\n#### `user_field_names` 없이:\n\n `order_by`는 정렬할 필드의 ID 뒤에 `field_`가 오는 쉼표로 구분된 목록이어야 합니다. 예를 들어 `order_by=field_1,-field_2` GET 매개변수를 제공하면 행은 `field_1`로 오름차순으로 정렬됩니다. 일부 필드에 동일한 값이 있는 경우 해당 하위 집합은 `field_2`로 내림차순으로 정렬됩니다.",
-        "filters": "행은 선택적으로 뷰에 사용할 수 있는 동일한 뷰 필터를 사용하여 필터링할 수 있습니다. 이 매개변수는 이 뷰에 적용할 필터 트리를 포함하는 JSON 직렬화된 문자열을 허용합니다. 필터 트리는 적용해야 하는 필터를 포함하는 중첩된 구조입니다. \n\n#### `user_field_names` 사용 시:\n\n유효한 필터 트리의 예는 다음과 같습니다: `{'{'{'}'}{'{'{'}'}'filter_type': 'AND', 'filters': [{'{'{'}'}{'{'{'}'}'field': 'Name', 'type': 'equal', 'value': 'test'{'}'}{'}'}]{'}'}{'}'}`.\n\n#### `user_field_names` 없이:\n\n예를 들어 다음 GET 매개변수를 제공하는 경우: `{'{'{'}'}{'{'{'}'}'filter_type': 'AND', 'filters': [{'{'{'}'}{'{'{'}'}'field': 1, 'type': 'equal', 'value': 'test'{'}'}{'}'}]{'}'}{'}'}`\n\n이 매개변수가 제공된 경우, 모든 다른 `filter__{field}__{filter}`는 무시되며, filter_type 매개변수도 무시됩니다.",
+        "filters": "행은 선택적으로 뷰에 사용할 수 있는 동일한 뷰 필터를 사용하여 필터링할 수 있습니다. 이 매개변수는 이 뷰에 적용할 필터 트리를 포함하는 JSON 직렬화된 문자열을 허용합니다. 필터 트리는 적용해야 하는 필터를 포함하는 중첩된 구조입니다. \n\n#### `user_field_names` 사용 시:\n\n유효한 필터 트리의 예는 다음과 같습니다: `{'{'}\"filter_type\": \"AND\", \"filters\": [{'{'}\"field\": \"Name\", \"type\": \"equal\", \"value\": \"test\"{'}'}]{'}'}`.\n\n#### `user_field_names` 없이:\n\n예를 들어 다음 GET 매개변수를 제공하는 경우: `{'{'}\"filter_type\": \"AND\", \"filters\": [{'{'}\"field\": 1, \"type\": \"equal\", \"value\": \"test\"{'}'}]{'}'}`\n\n이 매개변수가 제공된 경우, 모든 다른 `filter__{'{'}field{'}'}__{'{'}filter{'}'}` 는 무시되며, filter_type 매개변수도 무시됩니다.",
         "filter": "행은 선택적으로 뷰에 사용할 수 있는 동일한 뷰 필터를 사용하여 필터링할 수 있습니다. 동일한 형식을 따르는 경우 여러 필터를 적용할 수 있습니다. `field` 및 `filter` 변수는 각각 필터를 적용할 방법과 위치를 나타냅니다.\n\n#### `user_field_names` 사용 시:\n\n예를 들어 다음 GET 매개변수를 제공하는 경우: `filter__Name__equal=test`, `Name`의 값이 'test'인 행만 반환됩니다. 이 방법은 이전 버전과 호환되며 이름에서 실패하면 `field_id`를 확인합니다.\n\n#### `user_field_names` 없이:\n\n예를 들어 다음 GET 매개변수를 제공하는 경우: `filter__field_1__equal=test`, `field_1`의 값이 'test'인 행만 반환됩니다.\n\n필터 매개변수가 제공된 경우 이 매개변수는 무시됩니다. ",
         "filterLink": "모든 필터 목록은 여기에서 찾을 수 있습니다.",
         "filterType": "- `AND`: 제공된 모든 필터와 일치해야 함을 나타냅니다.\n- `OR`: 필터 중 하나와만 일치하면 됨을 나타냅니다.\n\n 이는 두 개 이상의 필터가 제공된 경우에만 작동합니다.",
diff --git a/web-frontend/modules/database/module.js b/web-frontend/modules/database/module.js
index df78fd22c9..4c427a204f 100644
--- a/web-frontend/modules/database/module.js
+++ b/web-frontend/modules/database/module.js
@@ -39,16 +39,7 @@ import {
   extendPages,
 } from 'nuxt/kit'
 import { routes } from './routes'
-
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-]
+import { locales } from '../../config/locales.js'
 
 export default defineNuxtModule({
   meta: {
diff --git a/web-frontend/modules/integrations/module.js b/web-frontend/modules/integrations/module.js
index 061067f931..b272f1ed1e 100644
--- a/web-frontend/modules/integrations/module.js
+++ b/web-frontend/modules/integrations/module.js
@@ -1,15 +1,5 @@
 import { defineNuxtModule, addPlugin, createResolver } from 'nuxt/kit'
-
-const locales = [
-  { code: 'en', name: 'English', file: 'en.json' },
-  { code: 'fr', name: 'Français', file: 'fr.json' },
-  { code: 'nl', name: 'Nederlands', file: 'nl.json' },
-  { code: 'de', name: 'Deutsch', file: 'de.json' },
-  { code: 'es', name: 'Español', file: 'es.json' },
-  { code: 'it', name: 'Italiano', file: 'it.json' },
-  { code: 'pl', name: 'Polski (Beta)', file: 'pl.json' },
-  { code: 'ko', name: '한국어', file: 'ko.json' },
-]
+import { locales } from '../../config/locales.js'
 
 export default defineNuxtModule({
   meta: {