diff --git a/jslib b/jslib
index daa4f6f9a6..f02720a1c6 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit daa4f6f9a6dc84d6cd9a937be6b5392d2cf51eca
+Subproject commit f02720a1c654adeb73d68b73bb61fcf7415041f4
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index 038518ae38..d752d9581a 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -62,24 +62,8 @@
                                     <small class="form-text text-muted">{{'yourNameDesc' | i18n}}</small>
                                 </div>
                                 <div class="form-group">
-                                    <app-callout type="info" *ngIf="enforcedPolicyOptions">
-                                        {{'masterPasswordPolicyInEffect' | i18n}}
-                                        <ul class="mb-0">
-                                            <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-                                                {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}}
-                                            </li>
-                                            <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-                                                {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
-                                            </li>
-                                            <li *ngIf="enforcedPolicyOptions?.requireUpper">
-                                                {{'policyInEffectUppercase' | i18n}}</li>
-                                            <li *ngIf="enforcedPolicyOptions?.requireLower">
-                                                {{'policyInEffectLowercase' | i18n}}</li>
-                                            <li *ngIf="enforcedPolicyOptions?.requireNumbers">
-                                                {{'policyInEffectNumbers' | i18n}}</li>
-                                            <li *ngIf="enforcedPolicyOptions?.requireSpecial">
-                                                {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
-                                        </ul>
+                                    <app-callout type="info" [enforcedPolicyOptions]="enforcedPolicyOptions"
+                                        *ngIf="enforcedPolicyOptions">
                                     </app-callout>
                                     <label for="masterPassword">{{'masterPass' | i18n}}</label>
                                     <div class="d-flex">
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index 3623fbd133..f2c640e217 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -43,26 +43,6 @@ export class RegisterComponent extends BaseRegisterComponent {
             passwordGenerationService, environmentService);
     }
 
-    getPasswordScoreAlertDisplay() {
-        if (this.enforcedPolicyOptions == null) {
-            return '';
-        }
-
-        let str: string;
-        switch (this.enforcedPolicyOptions.minComplexity) {
-            case 4:
-                str = this.i18nService.t('strong');
-                break;
-            case 3:
-                str = this.i18nService.t('good');
-                break;
-            default:
-                str = this.i18nService.t('weak');
-                break;
-        }
-        return str + ' (' + this.enforcedPolicyOptions.minComplexity + ')';
-    }
-
     async ngOnInit() {
         const queryParamsSub = this.route.queryParams.subscribe(qParams => {
             this.referenceData = new ReferenceEventRequest();
diff --git a/src/app/accounts/set-password.component.html b/src/app/accounts/set-password.component.html
index e3eeacd3fd..b41e5b9914 100644
--- a/src/app/accounts/set-password.component.html
+++ b/src/app/accounts/set-password.component.html
@@ -10,24 +10,8 @@
                 <div class="card-body" *ngIf="!syncLoading">
                     <app-callout type="info">{{'ssoCompleteRegistration' | i18n}}</app-callout>
                     <div class="form-group">
-                        <app-callout type="info" *ngIf="enforcedPolicyOptions">
-                            {{'masterPasswordPolicyInEffect' | i18n}}
-                            <ul class="mb-0">
-                                <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-                                    {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}}
-                                </li>
-                                <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-                                    {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
-                                </li>
-                                <li *ngIf="enforcedPolicyOptions?.requireUpper">
-                                    {{'policyInEffectUppercase' | i18n}}</li>
-                                <li *ngIf="enforcedPolicyOptions?.requireLower">
-                                    {{'policyInEffectLowercase' | i18n}}</li>
-                                <li *ngIf="enforcedPolicyOptions?.requireNumbers">
-                                    {{'policyInEffectNumbers' | i18n}}</li>
-                                <li *ngIf="enforcedPolicyOptions?.requireSpecial">
-                                    {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
-                            </ul>
+                        <app-callout type="info" [enforcedPolicyOptions]="enforcedPolicyOptions"
+                            *ngIf="enforcedPolicyOptions">
                         </app-callout>
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
                         <div class="d-flex">
diff --git a/src/app/accounts/update-temp-password.component.html b/src/app/accounts/update-temp-password.component.html
index 59685dee93..59d7d238d3 100644
--- a/src/app/accounts/update-temp-password.component.html
+++ b/src/app/accounts/update-temp-password.component.html
@@ -7,24 +7,8 @@
                     <app-callout type="warning">{{'updateMasterPasswordWarning' | i18n}}
                     </app-callout>
                     <div class="form-group">
-                        <app-callout type="info" *ngIf="enforcedPolicyOptions">
-                            {{'masterPasswordPolicyInEffect' | i18n}}
-                            <ul class="mb-0">
-                                <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-                                    {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}}
-                                </li>
-                                <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-                                    {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
-                                </li>
-                                <li *ngIf="enforcedPolicyOptions?.requireUpper">
-                                    {{'policyInEffectUppercase' | i18n}}</li>
-                                <li *ngIf="enforcedPolicyOptions?.requireLower">
-                                    {{'policyInEffectLowercase' | i18n}}</li>
-                                <li *ngIf="enforcedPolicyOptions?.requireNumbers">
-                                    {{'policyInEffectNumbers' | i18n}}</li>
-                                <li *ngIf="enforcedPolicyOptions?.requireSpecial">
-                                    {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
-                            </ul>
+                        <app-callout type="info" [enforcedPolicyOptions]="enforcedPolicyOptions"
+                            *ngIf="enforcedPolicyOptions">
                         </app-callout>
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
                         <div class="d-flex">
diff --git a/src/app/organizations/manage/reset-password.component.html b/src/app/organizations/manage/reset-password.component.html
index 7c3e708026..65491cb166 100644
--- a/src/app/organizations/manage/reset-password.component.html
+++ b/src/app/organizations/manage/reset-password.component.html
@@ -13,24 +13,9 @@
             <div class="modal-body">
                 <app-callout type="warning">{{'resetPasswordLoggedOutWarning' | i18n: loggedOutWarningName}}
                 </app-callout>
-                <app-callout type="info" *ngIf="enforcedPolicyOptions">
-                    {{'resetPasswordMasterPasswordPolicyInEffect' | i18n}}
-                    <ul class="mb-0">
-                        <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-                            {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}}
-                        </li>
-                        <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-                            {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
-                        </li>
-                        <li *ngIf="enforcedPolicyOptions?.requireUpper">
-                            {{'policyInEffectUppercase' | i18n}}</li>
-                        <li *ngIf="enforcedPolicyOptions?.requireLower">
-                            {{'policyInEffectLowercase' | i18n}}</li>
-                        <li *ngIf="enforcedPolicyOptions?.requireNumbers">
-                            {{'policyInEffectNumbers' | i18n}}</li>
-                        <li *ngIf="enforcedPolicyOptions?.requireSpecial">
-                            {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
-                    </ul>
+                <app-callout type="info" [enforcedPolicyOptions]="enforcedPolicyOptions"
+                    enforcedPolicyMessage="{{'resetPasswordMasterPasswordPolicyInEffect' | i18n}}"
+                    *ngIf="enforcedPolicyOptions">
                 </app-callout>
                 <div class="row">
                     <div class="col form-group">
diff --git a/src/app/organizations/manage/reset-password.component.ts b/src/app/organizations/manage/reset-password.component.ts
index 673fe30ff4..493318f709 100644
--- a/src/app/organizations/manage/reset-password.component.ts
+++ b/src/app/organizations/manage/reset-password.component.ts
@@ -1,5 +1,4 @@
 import {
-    AfterViewInit,
     Component,
     EventEmitter,
     Input,
@@ -17,6 +16,7 @@ import { PolicyService } from 'jslib-common/abstractions/policy.service';
 import { EncString } from 'jslib-common/models/domain/encString';
 import { MasterPasswordPolicyOptions } from 'jslib-common/models/domain/masterPasswordPolicyOptions';
 import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
+
 import { OrganizationUserResetPasswordRequest } from 'jslib-common/models/request/organizationUserResetPasswordRequest';
 
 @Component({
@@ -50,26 +50,6 @@ export class ResetPasswordComponent implements OnInit {
         return this.name != null ? this.name : this.i18nService.t('thisUser');
     }
 
-    getPasswordScoreAlertDisplay() {
-        if (this.enforcedPolicyOptions == null) {
-            return '';
-        }
-
-        let str: string;
-        switch (this.enforcedPolicyOptions.minComplexity) {
-            case 4:
-                str = this.i18nService.t('strong');
-                break;
-            case 3:
-                str = this.i18nService.t('good');
-                break;
-            default:
-                str = this.i18nService.t('weak');
-                break;
-        }
-        return str + ' (' + this.enforcedPolicyOptions.minComplexity + ')';
-    }
-
     async generatePassword() {
         const options = (await this.passwordGenerationService.getOptions())[0];
         this.newPassword = await this.passwordGenerationService.generatePassword(options);
diff --git a/src/app/settings/change-password.component.html b/src/app/settings/change-password.component.html
index b054586225..33b7264888 100644
--- a/src/app/settings/change-password.component.html
+++ b/src/app/settings/change-password.component.html
@@ -1,18 +1,5 @@
 <app-callout type="warning">{{'loggedOutWarning' | i18n}}</app-callout>
-<app-callout type="info" *ngIf="enforcedPolicyOptions">
-    {{'masterPasswordPolicyInEffect' | i18n}}
-    <ul class="mb-0">
-        <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-            {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}}
-        </li>
-        <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-            {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
-        </li>
-        <li *ngIf="enforcedPolicyOptions?.requireUpper">{{'policyInEffectUppercase' | i18n}}</li>
-        <li *ngIf="enforcedPolicyOptions?.requireLower">{{'policyInEffectLowercase' | i18n}}</li>
-        <li *ngIf="enforcedPolicyOptions?.requireNumbers">{{'policyInEffectNumbers' | i18n}}</li>
-        <li *ngIf="enforcedPolicyOptions?.requireSpecial">{{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
-    </ul>
+<app-callout type="info" [enforcedPolicyOptions]="enforcedPolicyOptions" *ngIf="enforcedPolicyOptions">
 </app-callout>
 
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate autocomplete="off">
@@ -38,9 +25,8 @@
         <div class="col-6">
             <div class="form-group">
                 <label for="masterPasswordRetype">{{'confirmNewMasterPass' | i18n}}</label>
-                <input id="masterPasswordRetype" type="password" name="MasterPasswordRetype"
-                    class="form-control" [(ngModel)]="masterPasswordRetype" required appInputVerbatim
-                    autocomplete="new-password">
+                <input id="masterPasswordRetype" type="password" name="MasterPasswordRetype" class="form-control"
+                    [(ngModel)]="masterPasswordRetype" required appInputVerbatim autocomplete="new-password">
             </div>
         </div>
     </div>
diff --git a/src/app/settings/emergency-access-takeover.component.html b/src/app/settings/emergency-access-takeover.component.html
index 466c9b6437..17ea9ae31c 100644
--- a/src/app/settings/emergency-access-takeover.component.html
+++ b/src/app/settings/emergency-access-takeover.component.html
@@ -12,33 +12,18 @@
             </div>
             <div class="modal-body">
                 <app-callout type="warning">{{'loggedOutWarning' | i18n}}</app-callout>
-                <app-callout type="info" *ngIf="enforcedPolicyOptions">
-                    {{'masterPasswordPolicyInEffect' | i18n}}
-                    <ul class="mb-0">
-                        <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-                            {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}}
-                        </li>
-                        <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-                            {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
-                        </li>
-                        <li *ngIf="enforcedPolicyOptions?.requireUpper">
-                            {{'policyInEffectUppercase' | i18n}}</li>
-                        <li *ngIf="enforcedPolicyOptions?.requireLower">
-                            {{'policyInEffectLowercase' | i18n}}</li>
-                        <li *ngIf="enforcedPolicyOptions?.requireNumbers">
-                            {{'policyInEffectNumbers' | i18n}}</li>
-                        <li *ngIf="enforcedPolicyOptions?.requireSpecial">
-                            {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
-                    </ul>
+                <app-callout type="info" [enforcedPolicyOptions]="enforcedPolicyOptions" *ngIf="enforcedPolicyOptions">
                 </app-callout>
                 <div class="row">
                     <div class="col-6">
                         <div class="form-group">
                             <label for="masterPassword">{{'newMasterPass' | i18n}}</label>
-                            <input id="masterPassword" type="password" name="NewMasterPasswordHash" class="form-control mb-1"
-                                [(ngModel)]="masterPassword" (input)="updatePasswordStrength()" required appInputVerbatim
+                            <input id="masterPassword" type="password" name="NewMasterPasswordHash"
+                                class="form-control mb-1" [(ngModel)]="masterPassword"
+                                (input)="updatePasswordStrength()" required appInputVerbatim
                                 autocomplete="new-password">
-                            <app-password-strength [score]="masterPasswordScore" [showText]="true"></app-password-strength>
+                            <app-password-strength [score]="masterPasswordScore" [showText]="true">
+                            </app-password-strength>
                         </div>
                     </div>
                     <div class="col-6">
@@ -56,7 +41,9 @@
                     <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
                     <span>{{'save' | i18n}}</span>
                 </button>
-                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'cancel' | i18n}}</button>
+                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">
+                    {{'cancel' | i18n}}
+                </button>
             </div>
         </form>
     </div>
diff --git a/src/scss/styles.scss b/src/scss/styles.scss
index c71abd2bf7..a3fb35de7b 100644
--- a/src/scss/styles.scss
+++ b/src/scss/styles.scss
@@ -758,6 +758,10 @@ app-user-billing {
             color: $warning;
         }
     }
+
+    .enforced-policy-options ul {
+        margin-bottom: 0px;
+    }
 }
 
 .list-group-2fa {