diff --git a/apps/web/app/_utils.tsx b/apps/web/app/_utils.tsx
index ae9ef7d181..22678de8ca 100644
--- a/apps/web/app/_utils.tsx
+++ b/apps/web/app/_utils.tsx
@@ -27,6 +27,15 @@ export const getFixedT = async (locale: string, ns = "common") => {
   return i18n.getFixedT(locale, ns);
 };
 
+export const getTranslate = async () => {
+  const headersList = await headers();
+  // If "x-locale" does not exist in header,
+  // ensure that config.matcher in middleware includes the page you are testing
+  const locale = headersList.get("x-locale");
+  const t = await getFixedT(locale ?? "en");
+  return t;
+};
+
 export const _generateMetadata = async (
   getTitle: (t: TFunction<string, undefined>) => string,
   getDescription: (t: TFunction<string, undefined>) => string,
diff --git a/apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx b/apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx
index cd70a918fa..751ca57481 100644
--- a/apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/apps/[category]/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import AdminAppsList from "@calcom/features/apps/AdminAppsList";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -12,9 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("apps")} description={t("admin_apps_description")}>
diff --git a/apps/web/app/settings/(admin-layout)/admin/flags/page.tsx b/apps/web/app/settings/(admin-layout)/admin/flags/page.tsx
index fc4ae1af2b..618428c462 100644
--- a/apps/web/app/settings/(admin-layout)/admin/flags/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/flags/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import { FlagListingView } from "@calcom/features/flags/pages/flag-listing-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("feature_flags")} description={t("admin_flags_description")}>
       <FlagListingView />
diff --git a/apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx b/apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx
index 8b932d1dcc..f166b3520a 100644
--- a/apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/impersonation/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import ImpersonationView from "~/settings/admin/impersonation-view";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("admin")} description={t("impersonation")}>
       <ImpersonationView />
diff --git a/apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx b/apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx
index 16b8a20ec7..78bcba5b06 100644
--- a/apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/lockedSMS/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import LockedSMSView from "~/settings/admin/locked-sms-view";
@@ -12,8 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("lockedSMS")} description={t("admin_lockedSMS_description")}>
       <LockedSMSView />
diff --git a/apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx b/apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx
index 96d1586673..6b09a951d6 100644
--- a/apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/oAuth/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import LegacyPage from "~/settings/admin/oauth-view";
@@ -12,8 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("oAuth")} description={t("admin_oAuth_description")}>
       <LegacyPage />
diff --git a/apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx b/apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
index 8636e4eefc..448902d771 100644
--- a/apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx
@@ -1,9 +1,8 @@
 import { type Params } from "app/_types";
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { OrgForm } from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -35,8 +34,7 @@ const Page = async ({ params }: { params: Params }) => {
 
   try {
     const org = await OrganizationRepository.adminFindById({ id: input.data.id });
-    const session = await getServerSessionForAppDir();
-    const t = await getFixedT(session?.user.locale || "en");
+    const t = await getTranslate();
     return (
       <SettingsHeader
         title={`${t("editing_org")}: ${org.name}`}
diff --git a/apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx b/apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx
index 2b20b5d393..ff9405db17 100644
--- a/apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/organizations/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import AdminOrgTable from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader title={t("organizations")} description={t("orgs_page_description")}>
       <LicenseRequired>
diff --git a/apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx b/apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
index 6af8d21634..d9a9f5d025 100644
--- a/apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/users/[id]/edit/page.tsx
@@ -1,9 +1,8 @@
 import { type Params } from "app/_types";
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { UsersEditView } from "@calcom/features/ee/users/pages/users-edit-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -37,8 +36,7 @@ const Page = async ({ params }: { params: Params }) => {
 
   try {
     const user = await UserRepository.adminFindById(input.data.id);
-    const session = await getServerSessionForAppDir();
-    const t = await getFixedT(session?.user.locale || "en");
+    const t = await getTranslate();
 
     return (
       <SettingsHeader title={t("editing_user")} description={t("admin_users_edit_description")}>
diff --git a/apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx b/apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx
index 85099b7bfe..a136a9758b 100644
--- a/apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/users/add/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("add_new_user")} description={t("admin_users_add_description")}>
diff --git a/apps/web/app/settings/(admin-layout)/admin/users/page.tsx b/apps/web/app/settings/(admin-layout)/admin/users/page.tsx
index 844474a746..178b22b6cc 100644
--- a/apps/web/app/settings/(admin-layout)/admin/users/page.tsx
+++ b/apps/web/app/settings/(admin-layout)/admin/users/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { Button } from "@calcom/ui";
@@ -12,8 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   return (
     <SettingsHeader
       title={t("users")}
diff --git a/apps/web/app/settings/(settings-layout)/billing/page.tsx b/apps/web/app/settings/(settings-layout)/billing/page.tsx
index 7b2a35bbd7..e3d3db0896 100644
--- a/apps/web/app/settings/(settings-layout)/billing/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/billing/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import BillingView from "~/settings/billing/billing-view";
@@ -13,8 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx b/apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx
index 0d519de2e0..df76d65886 100644
--- a/apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx
@@ -1,6 +1,5 @@
-import { getFixedT, _generateMetadata } from "app/_utils";
+import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { APP_NAME } from "@calcom/lib/constants";
 
@@ -13,10 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  // FIXME: Refactor me once next-auth endpoint is migrated to App Router
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx b/apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
index 7eea6fcbf8..7263eb9279 100644
--- a/apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx
@@ -1,7 +1,6 @@
 import type { PageProps } from "app/_types";
-import { getFixedT, _generateMetadata } from "app/_utils";
+import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { EditWebhookView } from "@calcom/features/webhooks/pages/webhook-edit-view";
 import { APP_NAME } from "@calcom/lib/constants";
@@ -14,9 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async ({ params }: PageProps) => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   const id = typeof params?.id === "string" ? params.id : undefined;
 
   const webhook = await WebhookRepository.findByWebhookId(id);
diff --git a/apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx b/apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx
index f871693059..98161ee6a4 100644
--- a/apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/developer/webhooks/new/page.tsx
@@ -1,6 +1,5 @@
-import { getFixedT, _generateMetadata } from "app/_utils";
+import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { NewWebhookView } from "@calcom/features/webhooks/pages/webhook-new-view";
 import { APP_NAME } from "@calcom/lib/constants";
@@ -12,9 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx
index 9a3c085aab..1388b63cec 100644
--- a/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import AppearancePage from "~/settings/my-account/appearance-view";
@@ -13,8 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("appearance")} description={t("appearance_description")}>
diff --git a/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx
index 7802d51a91..9ad2d08f15 100644
--- a/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { Button } from "@calcom/ui";
 
@@ -14,8 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   const AddCalendarButton = () => {
     return (
diff --git a/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx
index 7d65fdf452..0548c3cc75 100644
--- a/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx
@@ -1,8 +1,7 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
 import { ConferencingAppsViewWebWrapper } from "@calcom/atoms/monorepo";
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <ConferencingAppsViewWebWrapper
diff --git a/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx
index a53fd802ef..189b23194c 100644
--- a/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx
@@ -1,8 +1,7 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 import { revalidatePath } from "next/cache";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import GeneralQueryView from "~/settings/my-account/general-view";
@@ -14,9 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
   const revalidatePage = async () => {
     "use server";
     revalidatePath("settings/my-account/general");
diff --git a/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx
index 47c1466719..1a0eff28b2 100644
--- a/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import CreateNewOutOfOfficeEntryButton from "@calcom/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton";
 import { OutOfOfficeEntriesList } from "@calcom/features/settings/outOfOffice/OutOfOfficeEntriesList";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx
index a1981539d1..a1b2364145 100644
--- a/apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { APP_NAME } from "@calcom/lib/constants";
 
@@ -14,8 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/organizations/admin-api/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/admin-api/page.tsx
index 254d6b4c2e..2edf360cd7 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/admin-api/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/admin-api/page.tsx
@@ -1,6 +1,5 @@
-import { getFixedT, _generateMetadata } from "app/_utils";
+import { getTranslate, _generateMetadata } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import { AdminAPIView } from "@calcom/features/ee/organizations/pages/settings/admin-api";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,9 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx
index f8735f603a..90592bd9d2 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx
@@ -1,7 +1,6 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
 import OrgSettingsAttributesPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-list-view";
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 export const generateMetadata = async () =>
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("attributes")} description={t("attribute_meta_description")}>
diff --git a/apps/web/app/settings/(settings-layout)/organizations/dsync/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/dsync/page.tsx
index 6a963583fb..f9b24889f2 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/dsync/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/dsync/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import DirectorySyncTeamView from "@calcom/features/ee/dsync/page/team-dsync-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("directory_sync")} description={t("directory_sync_description")}>
diff --git a/apps/web/app/settings/(settings-layout)/organizations/general/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/general/page.tsx
index 3fc868c318..b9aef0c525 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/general/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/general/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/organizations/pages/settings/general";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("general")} description={t("general_description")} borderInShellHeader={true}>
diff --git a/apps/web/app/settings/(settings-layout)/organizations/privacy/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/privacy/page.tsx
index d95eed66a0..0aaea7ad85 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/privacy/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/privacy/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import PrivacyView from "@calcom/features/ee/organizations/pages/settings/privacy";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("privacy")} description={t("privacy_organization_description")}>
diff --git a/apps/web/app/settings/(settings-layout)/organizations/profile/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/profile/page.tsx
index dec1986af4..dbde8f0916 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/profile/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/profile/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/organizations/pages/settings/profile";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/organizations/sso/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/sso/page.tsx
index 6e624d73df..1f552811bf 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/sso/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/sso/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import OrgSSOView from "@calcom/features/ee/sso/page/orgs-sso-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("sso_configuration")} description={t("sso_configuration_description_orgs")}>
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
index 8f1a008937..d67f6b7f7c 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/appearance/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
index f632e82b3f..87959a9f46 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/members/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage, {
   TeamMembersCTA,
 } from "@calcom/features/ee/organizations/pages/settings/other-team-members-view";
@@ -13,8 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
index 1e38d3425c..6b205a731e 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/teams/other/[id]/profile/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/organizations/pages/settings/other-team-profile-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("profile")} description={t("profile_team_description")}>
diff --git a/apps/web/app/settings/(settings-layout)/organizations/teams/other/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/teams/other/page.tsx
index 3e546db058..464bee8c9c 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/teams/other/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/teams/other/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/organizations/pages/settings/other-team-listing-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("org_admin_other_teams")} description={t("org_admin_other_teams_description")}>
diff --git a/apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx b/apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
index 1d4edc82be..fb205b9e30 100644
--- a/apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import ProfileImpersonationViewWrapper from "~/settings/security/impersonation-view";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/security/password/page.tsx b/apps/web/app/settings/(settings-layout)/security/password/page.tsx
index df37858d99..1c6a7e49ef 100644
--- a/apps/web/app/settings/(settings-layout)/security/password/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/security/password/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import PasswordViewWrapper from "~/settings/security/password-view";
@@ -13,9 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("password")} description={t("password_description")} borderInShellHeader={true}>
diff --git a/apps/web/app/settings/(settings-layout)/security/sso/page.tsx b/apps/web/app/settings/(settings-layout)/security/sso/page.tsx
index 4579dd6abd..c36d344cbf 100644
--- a/apps/web/app/settings/(settings-layout)/security/sso/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/security/sso/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SAMLSSO from "@calcom/features/ee/sso/page/user-sso-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -12,9 +11,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx b/apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
index b60a01617c..e77f847d9d 100644
--- a/apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { getFixedT } from "app/_utils";
+import { getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 import TwoFactorAuthView from "~/settings/security/two-factor-auth-view";
@@ -12,9 +11,7 @@ export const generateMetadata = async () =>
     (t) => t("add_an_extra_layer_of_security")
   );
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx
index 8f1a008937..d67f6b7f7c 100644
--- a/apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/teams/[id]/appearance/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/teams/pages/team-appearance-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx
index 3e24ed997d..a79b3db1d0 100644
--- a/apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/teams/[id]/bookingLimits/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import TeamBookingLimitsView from "@calcom/features/ee/teams/pages/team-booking-limits-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx
index 8e51857e7e..bb4dd86d15 100644
--- a/apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/teams/[id]/members/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/teams/pages/team-members-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("team_members")} description={t("members_team_description")}>
diff --git a/apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx b/apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx
index 82f50b6d3a..d220dff371 100644
--- a/apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/teams/[id]/profile/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/teams/pages/team-profile-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader
diff --git a/apps/web/app/settings/(settings-layout)/teams/page.tsx b/apps/web/app/settings/(settings-layout)/teams/page.tsx
index 8be4b2e10a..aca38b534b 100644
--- a/apps/web/app/settings/(settings-layout)/teams/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/teams/page.tsx
@@ -1,6 +1,5 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/teams/pages/team-listing-view";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
@@ -11,8 +10,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("teams")} description={t("create_manage_teams_collaborative")}>
diff --git a/apps/web/app/settings/organizations/members/page.tsx b/apps/web/app/settings/organizations/members/page.tsx
index 33fceacab9..8dd3218c6d 100644
--- a/apps/web/app/settings/organizations/members/page.tsx
+++ b/apps/web/app/settings/organizations/members/page.tsx
@@ -1,7 +1,6 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
 
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
 import LegacyPage from "@calcom/features/ee/organizations/pages/members";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import SettingsLayoutAppDir from "@calcom/features/settings/appDir/SettingsLayoutAppDir";
@@ -13,8 +12,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
+  const t = await getTranslate();
 
   return (
     <SettingsHeader title={t("organization_members")} description={t("organization_description")}>
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index e33de4893d..dbcd774eda 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -166,7 +166,6 @@ export const config = {
 
     "/event-types",
     "/future/event-types/",
-    "/settings/admin/:path*",
     "/apps/installed/:category/",
     "/future/apps/installed/:category/",
     "/apps/:slug/",
@@ -179,7 +178,6 @@ export const config = {
     "/future/apps/categories/:category/",
     "/workflows/:path*",
     "/future/workflows/:path*",
-    "/settings/teams/:path*",
     "/getting-started/:step/",
     "/future/getting-started/:step/",
     "/apps",
@@ -189,6 +187,7 @@ export const config = {
     "/future/video/:path*",
     "/teams",
     "/future/teams/",
+    "/settings/:path*",
   ],
 };