diff --git a/jslib b/jslib
index 3b9ef68f4b..6bcadc4f40 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 3b9ef68f4b01036c84321d6bb4c3c14288bf137b
+Subproject commit 6bcadc4f408db2c150753f53a07d6f8888b6e9ff
diff --git a/src/app/organizations/settings/delete-organization.component.html b/src/app/organizations/settings/delete-organization.component.html
index 2c3cae47a3..80d8ae0f79 100644
--- a/src/app/organizations/settings/delete-organization.component.html
+++ b/src/app/organizations/settings/delete-organization.component.html
@@ -44,8 +44,8 @@
             </ng-container>
           </ng-template>
         </p>
-        <app-verify-master-password [(ngModel)]="masterPassword" ngDefaultControl name="secret">
-        </app-verify-master-password>
+        <app-user-verification [(ngModel)]="masterPassword" ngDefaultControl name="secret">
+        </app-user-verification>
       </div>
       <div class="modal-footer">
         <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts
index b583d3b3e0..b4470f0e63 100644
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -57,7 +57,7 @@ import { BadgeModule, ButtonModule } from "@bitwarden/components";
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 import { ToastrModule } from "ngx-toastr";
 
-import { VerifyMasterPasswordComponent } from "jslib-angular/components/verify-master-password.component";
+import { UserVerificationComponent } from "jslib-angular/components/user-verification.component";
 import { JslibModule } from "jslib-angular/jslib.module";
 
 import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component";
@@ -431,11 +431,11 @@ registerLocaleData(localeZhTw, "zh-TW");
     UserBillingComponent,
     UserLayoutComponent,
     UserSubscriptionComponent,
+    UserVerificationComponent,
     VaultComponent,
     VaultTimeoutInputComponent,
     VerifyEmailComponent,
     VerifyEmailTokenComponent,
-    VerifyMasterPasswordComponent,
     VerifyRecoverDeleteComponent,
     WeakPasswordsReportComponent,
   ],
diff --git a/src/app/settings/api-key.component.html b/src/app/settings/api-key.component.html
index 9cbcb9b3f4..8e042aa6e4 100644
--- a/src/app/settings/api-key.component.html
+++ b/src/app/settings/api-key.component.html
@@ -20,13 +20,13 @@
       </div>
       <div class="modal-body">
         <p>{{ apiKeyDescription | i18n }}</p>
-        <app-verify-master-password
+        <app-user-verification
           [(ngModel)]="masterPassword"
           ngDefaultControl
           name="secret"
           *ngIf="!clientSecret"
         >
-        </app-verify-master-password>
+        </app-user-verification>
 
         <app-callout type="warning" *ngIf="clientSecret">{{ apiKeyWarning | i18n }}</app-callout>
         <app-callout
diff --git a/src/app/settings/deauthorize-sessions.component.html b/src/app/settings/deauthorize-sessions.component.html
index d15e7b40a6..ac7dc7ba02 100644
--- a/src/app/settings/deauthorize-sessions.component.html
+++ b/src/app/settings/deauthorize-sessions.component.html
@@ -21,8 +21,8 @@
       <div class="modal-body">
         <p>{{ "deauthorizeSessionsDesc" | i18n }}</p>
         <app-callout type="warning">{{ "deauthorizeSessionsWarning" | i18n }}</app-callout>
-        <app-verify-master-password [(ngModel)]="masterPassword" ngDefaultControl name="secret">
-        </app-verify-master-password>
+        <app-user-verification [(ngModel)]="masterPassword" ngDefaultControl name="secret">
+        </app-user-verification>
       </div>
       <div class="modal-footer">
         <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
diff --git a/src/app/settings/delete-account.component.html b/src/app/settings/delete-account.component.html
index 2a6908b38b..6d53b4170f 100644
--- a/src/app/settings/delete-account.component.html
+++ b/src/app/settings/delete-account.component.html
@@ -21,8 +21,8 @@
       <div class="modal-body">
         <p>{{ "deleteAccountDesc" | i18n }}</p>
         <app-callout type="warning">{{ "deleteAccountWarning" | i18n }}</app-callout>
-        <app-verify-master-password [(ngModel)]="masterPassword" ngDefaultControl name="secret">
-        </app-verify-master-password>
+        <app-user-verification [(ngModel)]="masterPassword" ngDefaultControl name="secret">
+        </app-user-verification>
       </div>
       <div class="modal-footer">
         <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
diff --git a/src/app/settings/purge-vault.component.html b/src/app/settings/purge-vault.component.html
index 152ee8b073..2c6a9f50fc 100644
--- a/src/app/settings/purge-vault.component.html
+++ b/src/app/settings/purge-vault.component.html
@@ -21,8 +21,8 @@
       <div class="modal-body">
         <p>{{ (organizationId ? "purgeOrgVaultDesc" : "purgeVaultDesc") | i18n }}</p>
         <app-callout type="warning">{{ "purgeVaultWarning" | i18n }}</app-callout>
-        <app-verify-master-password [(ngModel)]="masterPassword" ngDefaultControl name="secret">
-        </app-verify-master-password>
+        <app-user-verification [(ngModel)]="masterPassword" ngDefaultControl name="secret">
+        </app-user-verification>
       </div>
       <div class="modal-footer">
         <button type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
diff --git a/src/app/settings/two-factor-verify.component.html b/src/app/settings/two-factor-verify.component.html
index 4bec1feffc..523514f1ae 100644
--- a/src/app/settings/two-factor-verify.component.html
+++ b/src/app/settings/two-factor-verify.component.html
@@ -1,8 +1,8 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
   <div class="modal-body">
     <p>{{ "twoStepLoginAuthDesc" | i18n }}</p>
-    <app-verify-master-password [(ngModel)]="secret" ngDefaultControl name="secret">
-    </app-verify-master-password>
+    <app-user-verification [(ngModel)]="secret" ngDefaultControl name="secret">
+    </app-user-verification>
   </div>
   <div class="modal-footer">
     <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
diff --git a/src/app/tools/export.component.html b/src/app/tools/export.component.html
index 5cd24412ec..077885bc19 100644
--- a/src/app/tools/export.component.html
+++ b/src/app/tools/export.component.html
@@ -27,8 +27,8 @@
   </div>
   <div class="row">
     <div class="form-group col-6">
-      <app-verify-master-password ngDefaultControl formControlName="secret" name="secret">
-      </app-verify-master-password>
+      <app-user-verification ngDefaultControl formControlName="secret" name="secret">
+      </app-user-verification>
     </div>
   </div>
   <button type="submit" class="btn btn-primary" [disabled]="form.loading || exportForm.disabled">