diff --git a/web/apps/accounts/src/pages/credentials.tsx b/web/apps/accounts/src/pages/credentials.tsx
new file mode 100644
index 000000000..7d21b33ac
--- /dev/null
+++ b/web/apps/accounts/src/pages/credentials.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/credentials";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/credentials/index.tsx b/web/apps/accounts/src/pages/credentials/index.tsx
deleted file mode 100644
index 306efc7b8..000000000
--- a/web/apps/accounts/src/pages/credentials/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import CredentialPage from "@ente/accounts/pages/credentials";
-import { APPS } from "@ente/shared/apps/constants";
-import { useContext } from "react";
-import { AppContext } from "../_app";
-
-export default function Credential() {
-    const appContext = useContext(AppContext);
-    return <CredentialPage appContext={appContext} appName={APPS.ACCOUNTS} />;
-}
diff --git a/web/apps/accounts/src/pages/generate.tsx b/web/apps/accounts/src/pages/generate.tsx
new file mode 100644
index 000000000..718172d49
--- /dev/null
+++ b/web/apps/accounts/src/pages/generate.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/generate";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/generate/index.tsx b/web/apps/accounts/src/pages/generate/index.tsx
deleted file mode 100644
index ff1b6aa1f..000000000
--- a/web/apps/accounts/src/pages/generate/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import GeneratePage from "@ente/accounts/pages/generate";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Generate() {
-    const appContext = useContext(AppContext);
-    return <GeneratePage appContext={appContext} appName={APPS.ACCOUNTS} />;
-}
diff --git a/web/apps/accounts/src/pages/login.tsx b/web/apps/accounts/src/pages/login.tsx
new file mode 100644
index 000000000..b40b9f914
--- /dev/null
+++ b/web/apps/accounts/src/pages/login.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/login";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/login/index.tsx b/web/apps/accounts/src/pages/login/index.tsx
deleted file mode 100644
index 0631a7bd1..000000000
--- a/web/apps/accounts/src/pages/login/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import LoginPage from "@ente/accounts/pages/login";
-import { APPS } from "@ente/shared/apps/constants";
-import { useContext } from "react";
-import { AppContext } from "../_app";
-
-export default function Login() {
-    const appContext = useContext(AppContext);
-    return <LoginPage appContext={appContext} appName={APPS.ACCOUNTS} />;
-}
diff --git a/web/apps/accounts/src/pages/recover.tsx b/web/apps/accounts/src/pages/recover.tsx
new file mode 100644
index 000000000..cc6d8da82
--- /dev/null
+++ b/web/apps/accounts/src/pages/recover.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/recover";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/recover/index.tsx b/web/apps/accounts/src/pages/recover/index.tsx
deleted file mode 100644
index 2692225b2..000000000
--- a/web/apps/accounts/src/pages/recover/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import RecoverPage from "@ente/accounts/pages/recover";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Recover() {
-    const appContext = useContext(AppContext);
-    return <RecoverPage appContext={appContext} appName={APPS.ACCOUNTS} />;
-}
diff --git a/web/apps/accounts/src/pages/signup.tsx b/web/apps/accounts/src/pages/signup.tsx
new file mode 100644
index 000000000..8cc5202a8
--- /dev/null
+++ b/web/apps/accounts/src/pages/signup.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/signup";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/signup/index.tsx b/web/apps/accounts/src/pages/signup/index.tsx
deleted file mode 100644
index 40d073cf5..000000000
--- a/web/apps/accounts/src/pages/signup/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import SignupPage from "@ente/accounts/pages/signup";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Sigup() {
-    const appContext = useContext(AppContext);
-    return <SignupPage appContext={appContext} appName={APPS.ACCOUNTS} />;
-}
diff --git a/web/apps/accounts/src/pages/two-factor/recover.tsx b/web/apps/accounts/src/pages/two-factor/recover.tsx
new file mode 100644
index 000000000..aa9c6faf9
--- /dev/null
+++ b/web/apps/accounts/src/pages/two-factor/recover.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/two-factor/recover";
+import { useContext } from "react";
+import { AppContext } from "../_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/two-factor/recover/index.tsx b/web/apps/accounts/src/pages/two-factor/recover/index.tsx
deleted file mode 100644
index af5765323..000000000
--- a/web/apps/accounts/src/pages/two-factor/recover/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import TwoFactorRecoverPage from "@ente/accounts/pages/two-factor/recover";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function TwoFactorRecover() {
-    const appContext = useContext(AppContext);
-    return (
-        <TwoFactorRecoverPage appContext={appContext} appName={APPS.ACCOUNTS} />
-    );
-}
diff --git a/web/apps/accounts/src/pages/two-factor/setup.tsx b/web/apps/accounts/src/pages/two-factor/setup.tsx
new file mode 100644
index 000000000..35a24149f
--- /dev/null
+++ b/web/apps/accounts/src/pages/two-factor/setup.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/two-factor/setup";
+import { useContext } from "react";
+import { AppContext } from "../_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/two-factor/setup/index.tsx b/web/apps/accounts/src/pages/two-factor/setup/index.tsx
deleted file mode 100644
index f1283e870..000000000
--- a/web/apps/accounts/src/pages/two-factor/setup/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import TwoFactorSetupPage from "@ente/accounts/pages/two-factor/setup";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function TwoFactorSetup() {
-    const appContext = useContext(AppContext);
-    return (
-        <TwoFactorSetupPage appContext={appContext} appName={APPS.ACCOUNTS} />
-    );
-}
diff --git a/web/apps/accounts/src/pages/two-factor/verify.tsx b/web/apps/accounts/src/pages/two-factor/verify.tsx
new file mode 100644
index 000000000..3f4ed7e39
--- /dev/null
+++ b/web/apps/accounts/src/pages/two-factor/verify.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/two-factor/verify";
+import { useContext } from "react";
+import { AppContext } from "../_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/two-factor/verify/index.tsx b/web/apps/accounts/src/pages/two-factor/verify/index.tsx
deleted file mode 100644
index fd4c2ce09..000000000
--- a/web/apps/accounts/src/pages/two-factor/verify/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import TwoFactorVerifyPage from "@ente/accounts/pages/two-factor/verify";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function TwoFactorVerify() {
-    const appContext = useContext(AppContext);
-    return (
-        <TwoFactorVerifyPage appContext={appContext} appName={APPS.ACCOUNTS} />
-    );
-}
diff --git a/web/apps/accounts/src/pages/verify.tsx b/web/apps/accounts/src/pages/verify.tsx
new file mode 100644
index 000000000..5fb2ed10d
--- /dev/null
+++ b/web/apps/accounts/src/pages/verify.tsx
@@ -0,0 +1,8 @@
+import { ensure } from "@/utils/ensure";
+import Page_ from "@ente/accounts/pages/verify";
+import { useContext } from "react";
+import { AppContext } from "./_app";
+
+const Page = () => <Page_ appContext={ensure(useContext(AppContext))} />;
+
+export default Page;
diff --git a/web/apps/accounts/src/pages/verify/index.tsx b/web/apps/accounts/src/pages/verify/index.tsx
deleted file mode 100644
index b09480858..000000000
--- a/web/apps/accounts/src/pages/verify/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import VerifyPage from "@ente/accounts/pages/verify";
-import { APPS } from "@ente/shared/apps/constants";
-import { AppContext } from "pages/_app";
-import { useContext } from "react";
-
-export default function Verify() {
-    const appContext = useContext(AppContext);
-    return <VerifyPage appContext={appContext} appName={APPS.ACCOUNTS} />;
-}
diff --git a/web/packages/shared/apps/types.ts b/web/packages/shared/apps/types.ts
index cde24788d..54424f146 100644
--- a/web/packages/shared/apps/types.ts
+++ b/web/packages/shared/apps/types.ts
@@ -4,6 +4,6 @@ import { APPS } from "./constants";
 
 export interface PageProps {
     appContext: BaseAppContextT;
-    appName: APPS;
+    appName?: APPS;
     twoFactorType?: TwoFactorType;
 }