diff --git a/apps/web/app/auth/password-reset/page.tsx b/apps/web/app/auth/password-reset/page.tsx
index b6d73f2f2..a52910a55 100644
--- a/apps/web/app/auth/password-reset/page.tsx
+++ b/apps/web/app/auth/password-reset/page.tsx
@@ -17,9 +17,10 @@ export const generateMetadata = async () => {
   };
 };
 
-function PasswordResetPage() {
-  const redirectPath = `${pathsConfig.auth.callback}?next=${pathsConfig.auth.passwordUpdate}`;
+const { callback, passwordUpdate, signIn } = pathsConfig.auth;
+const redirectPath = `${callback}?next=${passwordUpdate}`;
 
+function PasswordResetPage() {
   return (
     <>
       <Heading level={4}>
@@ -30,7 +31,7 @@ function PasswordResetPage() {
         <PasswordResetRequestContainer redirectPath={redirectPath} />
 
         <div className={'flex justify-center text-xs'}>
-          <Link href={pathsConfig.auth.signIn}>
+          <Link href={signIn}>
             <Button variant={'link'} size={'sm'}>
               <Trans i18nKey={'auth:passwordRecoveredQuestion'} />
             </Button>
diff --git a/apps/web/app/update-password/page.tsx b/apps/web/app/update-password/page.tsx
index af47c17a4..6128e4316 100644
--- a/apps/web/app/update-password/page.tsx
+++ b/apps/web/app/update-password/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from 'next/navigation';
 
-import { PasswordResetForm } from '@kit/auth/password-reset';
+import { UpdatePasswordForm } from '@kit/auth/password-reset';
 import { AuthLayoutShell } from '@kit/auth/shared';
 import { requireUser } from '@kit/supabase/require-user';
 import { getSupabaseServerComponentClient } from '@kit/supabase/server-component-client';
@@ -18,7 +18,7 @@ export const generateMetadata = async () => {
   };
 };
 
-async function PasswordResetPage() {
+async function UpdatePasswordPage() {
   const client = getSupabaseServerComponentClient();
   const auth = await requireUser(client);
 
@@ -29,9 +29,9 @@ async function PasswordResetPage() {
 
   return (
     <AuthLayoutShell Logo={AppLogo}>
-      <PasswordResetForm redirectTo={pathsConfig.app.home} />
+      <UpdatePasswordForm redirectTo={pathsConfig.app.home} />
     </AuthLayoutShell>
   );
 }
 
-export default withI18n(PasswordResetPage);
+export default withI18n(UpdatePasswordPage);
diff --git a/apps/web/lib/i18n/i18n.server.ts b/apps/web/lib/i18n/i18n.server.ts
index 225db9f08..fab05cfbc 100644
--- a/apps/web/lib/i18n/i18n.server.ts
+++ b/apps/web/lib/i18n/i18n.server.ts
@@ -1,3 +1,5 @@
+import { cache } from 'react';
+
 import { cookies, headers } from 'next/headers';
 
 import {
@@ -21,7 +23,7 @@ import { i18nResolver } from './i18n.resolver';
  *
  * Initialize the i18n instance for every RSC server request (eg. each page/layout)
  */
-export function createI18nServerInstance() {
+function createInstance() {
   const acceptLanguage = headers().get('accept-language');
   const cookie = cookies().get(I18N_COOKIE_NAME)?.value;
 
@@ -42,3 +44,5 @@ export function createI18nServerInstance() {
 
   return initializeServerI18n(settings, i18nResolver);
 }
+
+export const createI18nServerInstance = cache(createInstance);
diff --git a/packages/features/auth/src/components/password-reset-form.tsx b/packages/features/auth/src/components/update-password-form.tsx
similarity index 98%
rename from packages/features/auth/src/components/password-reset-form.tsx
rename to packages/features/auth/src/components/update-password-form.tsx
index b8a2f8f8c..0e53a49c2 100644
--- a/packages/features/auth/src/components/password-reset-form.tsx
+++ b/packages/features/auth/src/components/update-password-form.tsx
@@ -28,7 +28,7 @@ import { Trans } from '@kit/ui/trans';
 
 import { PasswordResetSchema } from '../schemas/password-reset.schema';
 
-export function PasswordResetForm(params: { redirectTo: string }) {
+export function UpdatePasswordForm(params: { redirectTo: string }) {
   const updateUser = useUpdateUser();
 
   const form = useForm<z.infer<typeof PasswordResetSchema>>({
diff --git a/packages/features/auth/src/password-reset.ts b/packages/features/auth/src/password-reset.ts
index 6d1ec49d4..6949518f3 100644
--- a/packages/features/auth/src/password-reset.ts
+++ b/packages/features/auth/src/password-reset.ts
@@ -1,2 +1,2 @@
 export * from './components/password-reset-request-container';
-export * from './components/password-reset-form';
+export * from './components/update-password-form';