diff --git a/src/app/services.module.ts b/src/app/services.module.ts
index 852588db64..1d49a7e9f2 100644
--- a/src/app/services.module.ts
+++ b/src/app/services.module.ts
@@ -114,7 +114,7 @@ const lockService = new LockService(cipherService, folderService, collectionServ
 const syncService = new SyncService(userService, apiService, settingsService,
     folderService, cipherService, cryptoService, collectionService, storageService, messagingService, policyService,
     async (expired: boolean) => messagingService.send('logout', { expired: expired }));
-const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService);
+const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService, policyService);
 const totpService = new TotpService(storageService, cryptoFunctionService);
 const containerService = new ContainerService(cryptoService);
 const authService = new AuthService(cryptoService, apiService,
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index 4e424aef59..46baf59b7c 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -70,22 +70,22 @@
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="uppercase">A-Z</label>
                                 <input id="uppercase" type="checkbox" (change)="saveOptions()"
-                                    [(ngModel)]="options.uppercase">
+                                    [disabled]="enforcedPolicyOptions?.useUppercase" [(ngModel)]="options.uppercase">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="lowercase">a-z</label>
                                 <input id="lowercase" type="checkbox" (change)="saveOptions()"
-                                    [(ngModel)]="options.lowercase">
+                                    [disabled]="enforcedPolicyOptions?.useLowercase" [(ngModel)]="options.lowercase">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="numbers">0-9</label>
                                 <input id="numbers" type="checkbox" (change)="saveOptions()"
-                                    [(ngModel)]="options.number">
+                                    [disabled]="enforcedPolicyOptions?.useNumbers" [(ngModel)]="options.number">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                                 <label for="special">!@#$%^&*</label>
                                 <input id="special" type="checkbox" (change)="saveOptions()"
-                                    [(ngModel)]="options.special">
+                                    [disabled]="enforcedPolicyOptions?.useSpecial" [(ngModel)]="options.special">
                             </div>
                         </div>
                     </div>
@@ -93,12 +93,12 @@
                         <div class="box-content condensed">
                             <div class="box-content-row box-content-row-input" appBoxRow>
                                 <label for="min-number">{{'minNumbers' | i18n}}</label>
-                                <input id="min-number" type="number" min="0" max="9" (input)="saveOptions()"
+                                <input id="min-number" type="number" min="0" max="9" (blur)="saveOptions()"
                                     [(ngModel)]="options.minNumber">
                             </div>
                             <div class="box-content-row box-content-row-input" appBoxRow>
                                 <label for="min-special">{{'minSpecial' | i18n}}</label>
-                                <input id="min-special" type="number" min="0" max="9" (input)="saveOptions()"
+                                <input id="min-special" type="number" min="0" max="9" (blur)="saveOptions()"
                                     [(ngModel)]="options.minSpecial">
                             </div>
                             <div class="box-content-row box-content-row-checkbox" appBoxRow>