diff --git a/packages/nc-gui/pages/index/index.vue b/packages/nc-gui/pages/index/index.vue
index e02ea6d55b..87c8f8df40 100644
--- a/packages/nc-gui/pages/index/index.vue
+++ b/packages/nc-gui/pages/index/index.vue
@@ -5,7 +5,7 @@ const route = useRoute()
 </script>
 
 <template>
-  <LazyNuxtLayout>
+  <NuxtLayout>
     <div
       class="min-h-[calc(100vh_-_var(--header-height))] h-auto bg-primary bg-opacity-5 flex flex-col lg:flex-row flex-wrap gap-6 py-6 px-12 pt-65px"
     >
@@ -33,5 +33,5 @@ const route = useRoute()
         </template>
       </div>
     </div>
-  </LazyNuxtLayout>
+  </NuxtLayout>
 </template>
diff --git a/packages/nc-gui/pages/index/user/index.vue b/packages/nc-gui/pages/index/user/index.vue
index f8eacfa737..8684d74738 100644
--- a/packages/nc-gui/pages/index/user/index.vue
+++ b/packages/nc-gui/pages/index/user/index.vue
@@ -1,5 +1,146 @@
+<script lang="ts" setup>
+import { message, navigateTo, reactive, ref, useApi, useGlobal, useI18n } from '#imports'
+
+const { api, error } = useApi({ useGlobalInstance: true })
+
+const { t } = useI18n()
+
+const { signOut } = useGlobal()
+
+const formValidator = ref()
+
+const form = reactive({
+  currentPassword: '',
+  password: '',
+  passwordRepeat: '',
+})
+
+const formRules = {
+  currentPassword: [
+    // Current password is required
+    { required: true, message: t('msg.error.signUpRules.passwdRequired') },
+  ],
+  password: [
+    // Password is required
+    { required: true, message: t('msg.error.signUpRules.passwdRequired') },
+    { min: 8, message: t('msg.error.signUpRules.passwdLength') },
+  ],
+  passwordRepeat: [
+    // PasswordRepeat is required
+    { required: true, message: t('msg.error.signUpRules.passwdRequired') },
+    // Passwords match
+    {
+      validator: (_: unknown, _v: string) => {
+        return new Promise((resolve, reject) => {
+          if (form.password === form.passwordRepeat) return resolve(true)
+          reject(new Error(t('msg.error.signUpRules.passwdMismatch')))
+        })
+      },
+      message: t('msg.error.signUpRules.passwdMismatch'),
+    },
+  ],
+}
+
+const passwordChange = async () => {
+  const valid = formValidator.value.validate()
+  if (!valid) return
+
+  error.value = null
+
+  await api.auth.passwordChange({
+    currentPassword: form.currentPassword,
+    newPassword: form.password,
+  })
+
+  message.success(t('msg.success.passwordChanged'))
+
+  signOut()
+
+  navigateTo('/signin')
+}
+
+const resetError = () => {
+  if (error.value) error.value = null
+}
+</script>
+
 <template>
   <NuxtLayout>
-    <NuxtPage />
+    <div class="mt-4 w-1/2 mx-auto">
+      <a-form ref="formValidator" layout="vertical" :model="form" class="change-password" @finish="passwordChange">
+        <div class="md:relative flex flex-col gap-2 w-full h-full p-8 w-full">
+          <h1 class="prose-2xl font-bold mb-4">{{ $t('activity.changePwd') }}</h1>
+
+          <Transition name="layout">
+            <div v-if="error" class="self-center mb-4 bg-red-500 text-white rounded-lg w-3/4 p-1">
+              <div class="flex items-center gap-2 justify-center">
+                <MaterialSymbolsWarning />
+                {{ error }}
+              </div>
+            </div>
+          </Transition>
+
+          <a-form-item :label="$t('placeholder.password.current')" name="currentPassword" :rules="formRules.currentPassword">
+            <a-input-password
+              v-model:value="form.currentPassword"
+              size="large"
+              class="password"
+              :placeholder="$t('placeholder.password.current')"
+              @focus="resetError"
+            />
+          </a-form-item>
+
+          <a-form-item :label="$t('placeholder.password.new')" name="password" :rules="formRules.password">
+            <a-input-password
+              v-model:value="form.password"
+              size="large"
+              class="password"
+              :placeholder="$t('placeholder.password.new')"
+              @focus="resetError"
+            />
+          </a-form-item>
+
+          <a-form-item :label="$t('placeholder.password.confirm')" name="passwordRepeat" :rules="formRules.passwordRepeat">
+            <a-input-password
+              v-model:value="form.passwordRepeat"
+              size="large"
+              class="password"
+              :placeholder="$t('placeholder.password.confirm')"
+              @focus="resetError"
+            />
+          </a-form-item>
+
+          <div class="flex flex-wrap gap-4 items-center mt-4 md:justify-between w-full">
+            <button class="submit" type="submit">
+              <span class="flex items-center gap-2">
+                <MdiKeyChange />
+                {{ $t('activity.changePwd') }}
+              </span>
+            </button>
+          </div>
+        </div>
+      </a-form>
+    </div>
   </NuxtLayout>
 </template>
+
+<style lang="scss">
+.change-password {
+  @apply border-1 shadow-md rounded;
+
+  .ant-input-affix-wrapper,
+  .ant-input {
+    @apply !appearance-none my-1 border-1 border-solid border-primary/50 rounded;
+  }
+
+  .password {
+    input {
+      @apply !border-none;
+    }
+  }
+
+  .submit {
+    @apply ml-1 border border-gray-300 rounded-lg p-4 bg-gray-100/50 text-white bg-primary hover:(bg-primary bg-opacity-75);
+  }
+}
+</style>
diff --git a/packages/nc-gui/pages/index/user/index/index.vue b/packages/nc-gui/pages/index/user/index/index.vue
deleted file mode 100644
index ecf7834b47..0000000000
--- a/packages/nc-gui/pages/index/user/index/index.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<script lang="ts" setup>
-import { message } from 'ant-design-vue'
-import { extractSdkResponseErrorMsg, navigateTo, reactive, ref, useApi, useGlobal, useI18n } from '#imports'
-
-const { api } = useApi()
-
-const { t } = useI18n()
-
-const { signOut } = useGlobal()
-
-const formValidator = ref()
-let error = $ref<string | null>(null)
-
-const form = reactive({
-  currentPassword: '',
-  password: '',
-  passwordRepeat: '',
-})
-
-const formRules = {
-  currentPassword: [
-    // Current password is required
-    { required: true, message: t('msg.error.signUpRules.passwdRequired') },
-  ],
-  password: [
-    // Password is required
-    { required: true, message: t('msg.error.signUpRules.passwdRequired') },
-    { min: 8, message: t('msg.error.signUpRules.passwdLength') },
-  ],
-  passwordRepeat: [
-    // PasswordRepeat is required
-    { required: true, message: t('msg.error.signUpRules.passwdRequired') },
-    // Passwords match
-    {
-      validator: (_: unknown, _v: string) => {
-        return new Promise((resolve, reject) => {
-          if (form.password === form.passwordRepeat) return resolve(true)
-          reject(new Error(t('msg.error.signUpRules.passwdMismatch')))
-        })
-      },
-      message: t('msg.error.signUpRules.passwdMismatch'),
-    },
-  ],
-}
-
-const passwordChange = async () => {
-  const valid = formValidator.value.validate()
-  if (!valid) return
-
-  error = null
-  try {
-    await api.auth.passwordChange({
-      currentPassword: form.currentPassword,
-      newPassword: form.password,
-    })
-    // Password changed successfully. Please login again.
-    message.success(t('msg.success.passwordChanged'))
-    signOut()
-    navigateTo('/signin')
-  } catch (e: any) {
-    error = await extractSdkResponseErrorMsg(e)
-  }
-}
-
-const resetError = () => {
-  if (error) {
-    error = null
-  }
-}
-</script>
-
-<template>
-  <div class="mt-4 w-1/2 mx-auto">
-    <a-form ref="formValidator" layout="vertical" :model="form" class="change-password" @finish="passwordChange">
-      <div class="md:relative flex flex-col gap-2 w-full h-full p-8 w-full">
-        <h1 class="prose-2xl font-bold mb-4">{{ $t('activity.changePwd') }}</h1>
-
-        <Transition name="layout">
-          <div v-if="error" class="self-center mb-4 bg-red-500 text-white rounded-lg w-3/4 p-1">
-            <div class="flex items-center gap-2 justify-center">
-              <MaterialSymbolsWarning />
-              {{ error }}
-            </div>
-          </div>
-        </Transition>
-
-        <a-form-item :label="$t('placeholder.password.current')" name="currentPassword" :rules="formRules.currentPassword">
-          <a-input-password
-            v-model:value="form.currentPassword"
-            size="large"
-            class="password"
-            :placeholder="$t('placeholder.password.current')"
-            @focus="resetError"
-          />
-        </a-form-item>
-
-        <a-form-item :label="$t('placeholder.password.new')" name="password" :rules="formRules.password">
-          <a-input-password
-            v-model:value="form.password"
-            size="large"
-            class="password"
-            :placeholder="$t('placeholder.password.new')"
-            @focus="resetError"
-          />
-        </a-form-item>
-
-        <a-form-item :label="$t('placeholder.password.confirm')" name="passwordRepeat" :rules="formRules.passwordRepeat">
-          <a-input-password
-            v-model:value="form.passwordRepeat"
-            size="large"
-            class="password"
-            :placeholder="$t('placeholder.password.confirm')"
-            @focus="resetError"
-          />
-        </a-form-item>
-
-        <div class="flex flex-wrap gap-4 items-center mt-4 md:justify-between w-full">
-          <button class="submit" type="submit">
-            <span class="flex items-center gap-2">
-              <MdiKeyChange />
-              {{ $t('activity.changePwd') }}
-            </span>
-          </button>
-        </div>
-      </div>
-    </a-form>
-  </div>
-</template>
-
-<style lang="scss">
-.change-password {
-  @apply border-1 shadow-md rounded;
-
-  .ant-input-affix-wrapper,
-  .ant-input {
-    @apply !appearance-none my-1 border-1 border-solid border-primary/50 rounded;
-  }
-
-  .password {
-    input {
-      @apply !border-none;
-    }
-  }
-
-  .submit {
-    @apply ml-1 border border-gray-300 rounded-lg p-4 bg-gray-100/50 text-white bg-primary hover:(bg-primary bg-opacity-75);
-  }
-}
-</style>