diff --git a/jslib b/jslib
index b816ddddff..0a30c7eb1e 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit b816ddddff96b53a77620b8b31d6ca699f0a8195
+Subproject commit 0a30c7eb1ecbac500e6c55a7d4024d98efa982bc
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index 761a313166..2c3bdec125 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-sm" role="document">
         <div class="modal-content">
             <div class="modal-body">
-                <app-callout type="info" *ngIf="policyInEffect">
+                <app-callout type="info" *ngIf="enforcedPolicyOptions?.inEffect()">
                     {{'passwordGeneratorPolicyInEffect' | i18n}}
                 </app-callout>
                 <div class="password-block">
@@ -40,7 +40,7 @@
                     <div class="box-content condensed">
                         <div class="box-content-row box-content-row-input" appBoxRow>
                             <label for="num-words">{{'numWords' | i18n}}</label>
-                            <input id="num-words" type="number" min="3" max="20" (input)="saveOptions()"
+                            <input id="num-words" type="number" min="3" max="20" (blur)="saveOptions()"
                                 [(ngModel)]="options.numWords">
                         </div>
                         <div class="box-content-row box-content-row-input" appBoxRow>
@@ -51,12 +51,12 @@
                         <div class="box-content-row box-content-row-checkbox" appBoxRow>
                             <label for="capitalize">{{'capitalize' | i18n}}</label>
                             <input id="capitalize" type="checkbox" (change)="saveOptions()"
-                                [(ngModel)]="options.capitalize">
+                                [(ngModel)]="options.capitalize" [disabled]="enforcedPolicyOptions?.capitalize">
                         </div>
                         <div class="box-content-row box-content-row-checkbox" appBoxRow>
                             <label for="include-number">{{'includeNumber' | i18n}}</label>
                             <input id="include-number" type="checkbox" (change)="saveOptions()"
-                                [(ngModel)]="options.includeNumber">
+                                [(ngModel)]="options.includeNumber" [disabled]="enforcedPolicyOptions?.includeNumber">
                         </div>
                     </div>
                 </div>