diff --git a/apps/web/src/auth/settings/two-factor-authenticator.component.ts b/apps/web/src/auth/settings/two-factor-authenticator.component.ts
index a82c54d346..55f1840901 100644
--- a/apps/web/src/auth/settings/two-factor-authenticator.component.ts
+++ b/apps/web/src/auth/settings/two-factor-authenticator.component.ts
@@ -41,6 +41,7 @@ export class TwoFactorAuthenticatorComponent
   token: string;
   formPromise: Promise<TwoFactorAuthenticatorResponse>;
 
+  override componentName = "app-two-factor-authenticator";
   private qrScript: HTMLScriptElement;
 
   constructor(
diff --git a/apps/web/src/auth/settings/two-factor-base.component.ts b/apps/web/src/auth/settings/two-factor-base.component.ts
index f32770b0d0..116950d267 100644
--- a/apps/web/src/auth/settings/two-factor-base.component.ts
+++ b/apps/web/src/auth/settings/two-factor-base.component.ts
@@ -23,6 +23,7 @@ export abstract class TwoFactorBaseComponent {
 
   protected hashedSecret: string;
   protected verificationType: VerificationType;
+  protected componentName = "";
 
   constructor(
     protected apiService: ApiService,
@@ -53,7 +54,9 @@ export abstract class TwoFactorBaseComponent {
       this.i18nService.t("disable"),
       this.i18nService.t("yes"),
       this.i18nService.t("no"),
-      "warning"
+      "warning",
+      false,
+      this.componentName != "" ? this.componentName + " .modal-content" : null
     );
     if (!confirmed) {
       return;
diff --git a/apps/web/src/auth/settings/two-factor-duo.component.ts b/apps/web/src/auth/settings/two-factor-duo.component.ts
index 14388ea5bf..c14725da87 100644
--- a/apps/web/src/auth/settings/two-factor-duo.component.ts
+++ b/apps/web/src/auth/settings/two-factor-duo.component.ts
@@ -23,6 +23,8 @@ export class TwoFactorDuoComponent extends TwoFactorBaseComponent {
   host: string;
   formPromise: Promise<TwoFactorDuoResponse>;
 
+  override componentName = "app-two-factor-duo";
+
   constructor(
     apiService: ApiService,
     i18nService: I18nService,
diff --git a/apps/web/src/auth/settings/two-factor-email.component.ts b/apps/web/src/auth/settings/two-factor-email.component.ts
index 38070bd3ea..087946ccc5 100644
--- a/apps/web/src/auth/settings/two-factor-email.component.ts
+++ b/apps/web/src/auth/settings/two-factor-email.component.ts
@@ -26,6 +26,8 @@ export class TwoFactorEmailComponent extends TwoFactorBaseComponent {
   formPromise: Promise<TwoFactorEmailResponse>;
   emailPromise: Promise<unknown>;
 
+  override componentName = "app-two-factor-email";
+
   constructor(
     apiService: ApiService,
     i18nService: I18nService,
diff --git a/apps/web/src/auth/settings/two-factor-webauthn.component.ts b/apps/web/src/auth/settings/two-factor-webauthn.component.ts
index 0fc3bfb29c..0110ae59f5 100644
--- a/apps/web/src/auth/settings/two-factor-webauthn.component.ts
+++ b/apps/web/src/auth/settings/two-factor-webauthn.component.ts
@@ -41,6 +41,8 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
   challengePromise: Promise<ChallengeResponse>;
   formPromise: Promise<TwoFactorWebAuthnResponse>;
 
+  override componentName = "app-two-factor-webauthn";
+
   constructor(
     apiService: ApiService,
     i18nService: I18nService,
diff --git a/apps/web/src/auth/settings/two-factor-yubikey.component.ts b/apps/web/src/auth/settings/two-factor-yubikey.component.ts
index 1f86b381eb..6c41740094 100644
--- a/apps/web/src/auth/settings/two-factor-yubikey.component.ts
+++ b/apps/web/src/auth/settings/two-factor-yubikey.component.ts
@@ -29,6 +29,8 @@ export class TwoFactorYubiKeyComponent extends TwoFactorBaseComponent {
   formPromise: Promise<TwoFactorYubiKeyResponse>;
   disablePromise: Promise<unknown>;
 
+  override componentName = "app-two-factor-yubikey";
+
   constructor(
     apiService: ApiService,
     i18nService: I18nService,