diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 3469d32a0f0..f42d610a288 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -330,21 +330,6 @@ const routes: Routes = [
     canActivate: [authGuard],
     data: { elevation: 1 } satisfies RouteDataProperties,
   },
-  {
-    path: "",
-    component: ExtensionAnonLayoutWrapperComponent,
-    children: [
-      {
-        path: "change-password",
-        children: [
-          {
-            path: "",
-            component: ChangePasswordComponent,
-          },
-        ],
-      },
-    ],
-  },
   {
     path: "update-temp-password",
     component: UpdateTempPasswordComponent,
@@ -571,6 +556,16 @@ const routes: Routes = [
           showBackButton: true,
         } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
       },
+      // TODO: Should this have any guards?
+      {
+        path: "change-password",
+        children: [
+          {
+            path: "",
+            component: ChangePasswordComponent,
+          },
+        ],
+      },
     ],
   },
   {
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 9c6174cea23..7a629458eec 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -142,25 +142,6 @@ const routes: Routes = [
         canActivate: [unauthGuardFn()],
         data: { titleId: "deleteOrganization" },
       },
-      {
-        path: "",
-        component: AnonLayoutWrapperComponent,
-        children: [
-          {
-            path: "change-password",
-            children: [
-              {
-                path: "",
-                component: ChangePasswordComponent,
-              },
-            ],
-            data: {
-              hideFooter: true,
-            } satisfies AnonLayoutWrapperData,
-          },
-        ],
-        data: { titleId: "updatePassword" } satisfies RouteDataProperties,
-      },
       {
         path: "update-temp-password",
         component: UpdateTempPasswordComponent,
@@ -617,6 +598,18 @@ const routes: Routes = [
           },
         ],
       },
+      {
+        path: "change-password",
+        data: {
+          hideFooter: true,
+        } satisfies AnonLayoutWrapperData,
+        children: [
+          {
+            path: "",
+            component: ChangePasswordComponent,
+          },
+        ],
+      },
     ],
   },
   {