diff --git a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/organizations/settings/two-factor-setup.component.ts
index fa9d25b8be9..97179ab7aa7 100644
--- a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts
+++ b/apps/web/src/app/organizations/settings/two-factor-setup.component.ts
@@ -17,6 +17,7 @@ import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../..
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {
+  tabbedHeader = false;
   constructor(
     apiService: ApiService,
     modalService: ModalService,
diff --git a/apps/web/src/auth/settings/two-factor-setup.component.html b/apps/web/src/auth/settings/two-factor-setup.component.html
index 4073bab4c28..d61f62425e0 100644
--- a/apps/web/src/auth/settings/two-factor-setup.component.html
+++ b/apps/web/src/auth/settings/two-factor-setup.component.html
@@ -1,6 +1,6 @@
 <!-- Please remove this disable statement when editing this file! -->
 <!-- eslint-disable @angular-eslint/template/button-has-type -->
-<div class="page-header">
+<div [ngClass]="tabbedHeader ? 'tabbed-header' : 'page-header'">
   <h1 *ngIf="!organizationId">{{ "twoStepLogin" | i18n }}</h1>
   <h1 *ngIf="organizationId">{{ "twoStepLoginEnforcement" | i18n }}</h1>
 </div>
diff --git a/apps/web/src/auth/settings/two-factor-setup.component.ts b/apps/web/src/auth/settings/two-factor-setup.component.ts
index 818ade5bb25..dc5c08e81b9 100644
--- a/apps/web/src/auth/settings/two-factor-setup.component.ts
+++ b/apps/web/src/auth/settings/two-factor-setup.component.ts
@@ -43,6 +43,8 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
   modal: ModalRef;
   formPromise: Promise<any>;
 
+  tabbedHeader = true;
+
   private destroy$ = new Subject<void>();
   private twoFactorAuthPolicyAppliesToActiveUser: boolean;