diff --git a/apps/web/src/app/app.module.ts b/apps/web/src/app/app.module.ts
index fa4e5d42f56..2a67232e3db 100644
--- a/apps/web/src/app/app.module.ts
+++ b/apps/web/src/app/app.module.ts
@@ -6,7 +6,6 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
 import { AppComponent } from "./app.component";
-import { AuthModule } from "./auth";
 import { CoreModule } from "./core";
 import { OssRoutingModule } from "./oss-routing.module";
 import { OssModule } from "./oss.module";
@@ -20,7 +19,6 @@ import { WildcardRoutingModule } from "./wildcard-routing.module";
  */
 @NgModule({
   imports: [
-    AuthModule,
     OssModule,
     BrowserAnimationsModule,
     FormsModule,
diff --git a/apps/web/src/app/auth/auth.module.ts b/apps/web/src/app/auth/auth.module.ts
index 583e2cdc547..2e61e1cedbc 100644
--- a/apps/web/src/app/auth/auth.module.ts
+++ b/apps/web/src/app/auth/auth.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from "@angular/core";
 
+import { CoreAuthModule } from "./core";
 import { WebauthnLoginSettingsModule } from "./settings/webauthn-login-settings";
 
 @NgModule({
-  imports: [WebauthnLoginSettingsModule],
+  imports: [CoreAuthModule, WebauthnLoginSettingsModule],
   declarations: [],
   providers: [],
   exports: [
diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts
index 2bc9682d3c0..b2e44d7e3db 100644
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -24,7 +24,6 @@ import { MemoryStorageService } from "@bitwarden/common/platform/services/memory
 import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
 
 import { PolicyListService } from "../admin-console/core/policy-list.service";
-import { CoreAuthModule } from "../auth";
 import { HtmlStorageService } from "../core/html-storage.service";
 import { I18nService } from "../core/i18n.service";
 import { CollectionAdminService } from "../vault/core/collection-admin.service";
@@ -41,7 +40,7 @@ import { WebPlatformUtilsService } from "./web-platform-utils.service";
 
 @NgModule({
   declarations: [],
-  imports: [CommonModule, JslibServicesModule, CoreAuthModule],
+  imports: [CommonModule, JslibServicesModule],
   providers: [
     InitService,
     RouterService,
diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts
index d15addba3ef..16b4feee811 100644
--- a/apps/web/src/app/oss.module.ts
+++ b/apps/web/src/app/oss.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from "@angular/core";
 
 import { OrganizationCreateModule } from "./admin-console/organizations/create/organization-create.module";
 import { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module";
+import { AuthModule } from "./auth";
 import { LoginModule } from "./auth/login/login.module";
 import { TrialInitiationModule } from "./auth/trial-initiation/trial-initiation.module";
 import { LooseComponentsModule, SharedModule } from "./shared";
@@ -18,6 +19,7 @@ import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-f
     OrganizationUserModule,
     OrganizationCreateModule,
     LoginModule,
+    AuthModule,
   ],
   exports: [
     SharedModule,