diff --git a/apps/browser/src/auth/popup/login.component.html b/apps/browser/src/auth/popup/login-v1.component.html
similarity index 100%
rename from apps/browser/src/auth/popup/login.component.html
rename to apps/browser/src/auth/popup/login-v1.component.html
diff --git a/apps/browser/src/auth/popup/login.component.ts b/apps/browser/src/auth/popup/login-v1.component.ts
similarity index 98%
rename from apps/browser/src/auth/popup/login.component.ts
rename to apps/browser/src/auth/popup/login-v1.component.ts
index cd8e07ab7c..4441181c53 100644
--- a/apps/browser/src/auth/popup/login.component.ts
+++ b/apps/browser/src/auth/popup/login-v1.component.ts
@@ -3,7 +3,7 @@ import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
-import { LoginComponentV1 as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component";
+import { LoginComponentV1 as BaseLoginComponent } from "@bitwarden/angular/auth/components/login-v1.component";
 import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service";
 import {
   LoginStrategyServiceAbstraction,
@@ -29,7 +29,7 @@ import { flagEnabled } from "../../platform/flags";
 
 @Component({
   selector: "app-login",
-  templateUrl: "login.component.html",
+  templateUrl: "login-v1.component.html",
 })
 export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
   showPasswordless = false;
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 0652a4aa11..05b2c02c1e 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -38,8 +38,8 @@ import { HintComponent } from "../auth/popup/hint.component";
 import { HomeComponent } from "../auth/popup/home.component";
 import { LockComponent } from "../auth/popup/lock.component";
 import { LoginDecryptionOptionsComponent } from "../auth/popup/login-decryption-options/login-decryption-options.component";
+import { LoginComponentV1 } from "../auth/popup/login-v1.component";
 import { LoginViaAuthRequestComponent } from "../auth/popup/login-via-auth-request.component";
-import { LoginComponentV1 } from "../auth/popup/login.component";
 import { RegisterComponent } from "../auth/popup/register.component";
 import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
 import { SetPasswordComponent } from "../auth/popup/set-password.component";
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index f9b0b7a34b..7b2d2ba86b 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -25,8 +25,8 @@ import { HintComponent } from "../auth/popup/hint.component";
 import { HomeComponent } from "../auth/popup/home.component";
 import { LockComponent } from "../auth/popup/lock.component";
 import { LoginDecryptionOptionsComponent } from "../auth/popup/login-decryption-options/login-decryption-options.component";
+import { LoginComponentV1 } from "../auth/popup/login-v1.component";
 import { LoginViaAuthRequestComponent } from "../auth/popup/login-via-auth-request.component";
-import { LoginComponentV1 } from "../auth/popup/login.component";
 import { RegisterComponent } from "../auth/popup/register.component";
 import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
 import { SetPasswordComponent } from "../auth/popup/set-password.component";
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index 6d96602ec8..fe3e27ea9f 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -32,8 +32,8 @@ import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard";
 import { HintComponent } from "../auth/hint.component";
 import { LockComponent } from "../auth/lock.component";
 import { LoginDecryptionOptionsComponent } from "../auth/login/login-decryption-options/login-decryption-options.component";
+import { LoginComponentV1 } from "../auth/login/login-v1.component";
 import { LoginViaAuthRequestComponent } from "../auth/login/login-via-auth-request.component";
-import { LoginComponentV1 } from "../auth/login/login.component";
 import { RegisterComponent } from "../auth/register.component";
 import { RemovePasswordComponent } from "../auth/remove-password.component";
 import { SetPasswordComponent } from "../auth/set-password.component";
diff --git a/apps/desktop/src/auth/login/login.component.html b/apps/desktop/src/auth/login/login-v1.component.html
similarity index 100%
rename from apps/desktop/src/auth/login/login.component.html
rename to apps/desktop/src/auth/login/login-v1.component.html
diff --git a/apps/desktop/src/auth/login/login.component.ts b/apps/desktop/src/auth/login/login-v1.component.ts
similarity index 99%
rename from apps/desktop/src/auth/login/login.component.ts
rename to apps/desktop/src/auth/login/login-v1.component.ts
index 1cde641470..29586e5e7f 100644
--- a/apps/desktop/src/auth/login/login.component.ts
+++ b/apps/desktop/src/auth/login/login-v1.component.ts
@@ -34,7 +34,7 @@ const BroadcasterSubscriptionId = "LoginComponent";
 
 @Component({
   selector: "app-login",
-  templateUrl: "login.component.html",
+  templateUrl: "login-v1.component.html",
 })
 export class LoginComponentV1 extends BaseLoginComponent implements OnInit, OnDestroy {
   @ViewChild("environment", { read: ViewContainerRef, static: true })
diff --git a/apps/desktop/src/auth/login/login.module.ts b/apps/desktop/src/auth/login/login.module.ts
index 6a4affdfd2..c0b330bf2d 100644
--- a/apps/desktop/src/auth/login/login.module.ts
+++ b/apps/desktop/src/auth/login/login.module.ts
@@ -6,8 +6,8 @@ import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components
 import { SharedModule } from "../../app/shared/shared.module";
 
 import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component";
+import { LoginComponentV1 } from "./login-v1.component";
 import { LoginViaAuthRequestComponent } from "./login-via-auth-request.component";
-import { LoginComponentV1 } from "./login.component";
 
 @NgModule({
   imports: [SharedModule, RouterModule],
diff --git a/apps/web/src/app/auth/login/login.component.html b/apps/web/src/app/auth/login/login-v1.component.html
similarity index 100%
rename from apps/web/src/app/auth/login/login.component.html
rename to apps/web/src/app/auth/login/login-v1.component.html
diff --git a/apps/web/src/app/auth/login/login.component.ts b/apps/web/src/app/auth/login/login-v1.component.ts
similarity index 99%
rename from apps/web/src/app/auth/login/login.component.ts
rename to apps/web/src/app/auth/login/login-v1.component.ts
index 954fe5e988..9cc4d36a72 100644
--- a/apps/web/src/app/auth/login/login.component.ts
+++ b/apps/web/src/app/auth/login/login-v1.component.ts
@@ -39,7 +39,7 @@ import { OrganizationInvite } from "../organization-invite/organization-invite";
 
 @Component({
   selector: "app-login",
-  templateUrl: "login.component.html",
+  templateUrl: "login-v1.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
diff --git a/apps/web/src/app/auth/login/login.module.ts b/apps/web/src/app/auth/login/login.module.ts
deleted file mode 100644
index d137453033..0000000000
--- a/apps/web/src/app/auth/login/login.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { CheckboxModule } from "@bitwarden/components";
-
-import { SharedModule } from "../../../app/shared";
-
-import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component";
-import { LoginViaAuthRequestComponent } from "./login-via-auth-request.component";
-import { LoginViaWebAuthnComponent } from "./login-via-webauthn/login-via-webauthn.component";
-import { LoginComponentV1 } from "./login.component";
-
-@NgModule({
-  imports: [SharedModule, CheckboxModule],
-  declarations: [
-    LoginComponentV1,
-    LoginViaAuthRequestComponent,
-    LoginDecryptionOptionsComponent,
-    LoginViaWebAuthnComponent,
-  ],
-  exports: [
-    LoginComponentV1,
-    LoginViaAuthRequestComponent,
-    LoginDecryptionOptionsComponent,
-    LoginViaWebAuthnComponent,
-  ],
-})
-export class LoginModule {}
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index d8d52ca3e7..f54d190fc7 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -39,9 +39,9 @@ import { deepLinkGuard } from "./auth/guards/deep-link.guard";
 import { HintComponent } from "./auth/hint.component";
 import { LockComponent } from "./auth/lock.component";
 import { LoginDecryptionOptionsComponent } from "./auth/login/login-decryption-options/login-decryption-options.component";
+import { LoginComponentV1 } from "./auth/login/login-v1.component";
 import { LoginViaAuthRequestComponent } from "./auth/login/login-via-auth-request.component";
 import { LoginViaWebAuthnComponent } from "./auth/login/login-via-webauthn/login-via-webauthn.component";
-import { LoginComponentV1 } from "./auth/login/login.component";
 import { AcceptOrganizationComponent } from "./auth/organization-invite/accept-organization.component";
 import { RecoverDeleteComponent } from "./auth/recover-delete.component";
 import { RecoverTwoFactorComponent } from "./auth/recover-two-factor.component";
diff --git a/libs/angular/src/auth/components/login.component.ts b/libs/angular/src/auth/components/login-v1.component.ts
similarity index 100%
rename from libs/angular/src/auth/components/login.component.ts
rename to libs/angular/src/auth/components/login-v1.component.ts