diff --git a/bitwarden_license/src/app/organizations/manage/sso.component.html b/bitwarden_license/src/app/organizations/manage/sso.component.html
index 9472fb601b2..07ee1ffe335 100644
--- a/bitwarden_license/src/app/organizations/manage/sso.component.html
+++ b/bitwarden_license/src/app/organizations/manage/sso.component.html
@@ -24,6 +24,18 @@
         </select>
     </div>
 
+    <div class="form-group">
+        <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="useCryptoAgent" formControlName="useCryptoAgent">
+            <label class="form-check-label" for="useCryptoAgent">{{'enabled' | i18n}}</label>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label>{{'cryptoAgentUrl' | i18n}}</label>
+        <input class="form-control" formControlName="cryptoAgentUrl">
+    </div>
+
     <!-- OIDC -->
     <div *ngIf="data.value.configType == 1">
         <div class="config-section">
diff --git a/bitwarden_license/src/app/organizations/manage/sso.component.ts b/bitwarden_license/src/app/organizations/manage/sso.component.ts
index fa46e0d6877..8c47b0cb52f 100644
--- a/bitwarden_license/src/app/organizations/manage/sso.component.ts
+++ b/bitwarden_license/src/app/organizations/manage/sso.component.ts
@@ -37,6 +37,9 @@ export class SsoComponent implements OnInit {
     data = this.fb.group({
         configType: [],
 
+        useCryptoAgent: [],
+        cryptoAgentUrl: [],
+
         // OpenId
         authority: [],
         clientId: [],
diff --git a/jslib b/jslib
index 24fe8360323..71f8ef601fb 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 24fe836032354d4ec39435776e54dd0995e1b389
+Subproject commit 71f8ef601fb0a426264c1fdfd19edb4de2c648fa
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index 4927288c574..3250c2e592b 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -135,7 +135,7 @@ const totpService = new TotpService(storageService, cryptoFunctionService, conso
 const containerService = new ContainerService(cryptoService);
 const authService = new AuthService(cryptoService, apiService,
     userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService, vaultTimeoutService,
-    consoleLogService);
+    consoleLogService, cryptoFunctionService);
 const exportService = new ExportService(folderService, cipherService, apiService, cryptoService);
 const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService,
     platformUtilsService, cryptoService);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index fbf9c008eb8..b32bb21bcb8 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -4451,5 +4451,8 @@
   },
   "ssoSettingsSaved": {
     "message": "Single Sign-On configuration was saved."
+  },
+  "ssoCryptoAgentUnavailable": {
+    "message": "Unable to reach the crypto agent, try again later."
   }
 }