diff --git a/jslib b/jslib
index 44b86f5dd02..0a30c7eb1ec 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 44b86f5dd028271059b70a00d7878fbb1a06023f
+Subproject commit 0a30c7eb1ecbac500e6c55a7d4024d98efa982bc
diff --git a/src/popup/generator/password-generator.component.html b/src/popup/generator/password-generator.component.html
index 350c75c8e5a..c3dc240ee3d 100644
--- a/src/popup/generator/password-generator.component.html
+++ b/src/popup/generator/password-generator.component.html
@@ -11,7 +11,7 @@
     </div>
 </header>
 <content>
-    <app-callout type="info" *ngIf="policyInEffect">
+    <app-callout type="info" *ngIf="enforcedPolicyOptions?.inEffect()">
         {{'passwordGeneratorPolicyInEffect' | i18n}}
     </app-callout>
     <div class="password-block">
@@ -51,7 +51,7 @@
         <div class="box-content">
             <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>
@@ -61,11 +61,13 @@
             </div>
             <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">
+                <input id="capitalize" type="checkbox" (change)="saveOptions()" [(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">
+                <input id="include-number" type="checkbox" (change)="saveOptions()" [(ngModel)]="options.includeNumber"
+                    [disabled]="enforcedPolicyOptions?.includeNumber">
             </div>
         </div>
     </div>