diff --git a/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.html b/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.html
index 14a36275cfb3..3018523956d4 100644
--- a/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.html
+++ b/apps/desktop/src/auth/login/login-decryption-options/login-decryption-options.component.html
@@ -8,7 +8,9 @@ <h1 id="heading">{{ "logInInitiated" | i18n }}</h1>
     </div>
 
     <ng-container *ngIf="!loading">
-      <h6 id="subHeading" class="standard-bottom-margin">{{ "deviceApprovalRequired" | i18n }}</h6>
+      <h6 *ngIf="approvalRequired" id="subHeading" class="standard-bottom-margin">
+        {{ "deviceApprovalRequired" | i18n }}
+      </h6>
 
       <form id="rememberDeviceForm" class="standard-bottom-margin" [formGroup]="rememberDeviceForm">
         <div class="checkbox">
@@ -25,7 +27,7 @@ <h6 id="subHeading" class="standard-bottom-margin">{{ "deviceApprovalRequired" |
         <span id="rememberThisDeviceHintText">{{ "uncheckIfPublicDevice" | i18n }}</span>
       </form>
 
-      <div class="buttons with-rows">
+      <div *ngIf="approvalRequired" class="buttons with-rows">
         <div class="buttons-row" *ngIf="showApproveFromOtherDeviceBtn">
           <button
             (click)="approveFromOtherDevice()"
@@ -58,6 +60,14 @@ <h6 id="subHeading" class="standard-bottom-margin">{{ "deviceApprovalRequired" |
         </div>
       </div>
 
+      <div *ngIf="!approvalRequired" class="buttons with-rows">
+        <div class="buttons-row">
+          <button (click)="autoEnroll()" type="button" class="btn block">
+            {{ "continue" | i18n }}
+          </button>
+        </div>
+      </div>
+
       <div style="text-align: center">
         <p class="no-margin">{{ "loggingInAs" | i18n }} {{ userEmail }}</p>
         <a [routerLink]="[]" (click)="logOut()">{{ "notYou" | i18n }}</a>
diff --git a/apps/desktop/src/auth/sso.component.ts b/apps/desktop/src/auth/sso.component.ts
index 75f380b0ed3a..caabf6e6e5fa 100644
--- a/apps/desktop/src/auth/sso.component.ts
+++ b/apps/desktop/src/auth/sso.component.ts
@@ -43,7 +43,9 @@ export class SsoComponent extends BaseSsoComponent {
       cryptoFunctionService,
       environmentService,
       passwordGenerationService,
-      logService
+      logService,
+      // TODO: DO NOT MERGE LIKE THIS!
+      { getFeatureFlagBool: async () => true } as any
     );
     super.onSuccessfulLogin = () => {
       return syncService.fullSync(true);