diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index 23496639a5..2bb6c4ebe4 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -68,7 +68,7 @@
                         <div class="box-content-row box-content-row-checkbox" appBoxRow>
                             <label for="ambiguous">{{'ambiguous' | i18n}}</label>
                             <input id="ambiguous" type="checkbox" (change)="saveOptions()"
-                                   [(ngModel)]="options.ambiguous">
+                                   [(ngModel)]="avoidAmbiguous">
                         </div>
                     </div>
                 </div>
diff --git a/src/app/vault/password-generator.component.ts b/src/app/vault/password-generator.component.ts
index 7c87bda0a9..2bfa157c3a 100644
--- a/src/app/vault/password-generator.component.ts
+++ b/src/app/vault/password-generator.component.ts
@@ -25,12 +25,14 @@ export class PasswordGeneratorComponent implements OnInit {
     options: any = {};
     password: string = '-';
     showOptions = false;
+    avoidAmbiguous = false;
 
     constructor(private passwordGenerationService: PasswordGenerationService, private analytics: Angulartics2,
         private utilsService: UtilsService) { }
 
     async ngOnInit() {
         this.options = await this.passwordGenerationService.getOptions();
+        this.avoidAmbiguous = !this.options.ambiguous;
         this.password = this.passwordGenerationService.generatePassword(this.options);
         this.analytics.eventTrack.next({ action: 'Generated Password' });
         await this.passwordGenerationService.addHistory(this.password);
@@ -86,6 +88,7 @@ export class PasswordGeneratorComponent implements OnInit {
     private normalizeOptions() {
         this.options.minLowercase = 0;
         this.options.minUppercase = 0;
+        this.options.ambiguous = !this.avoidAmbiguous;
 
         if (!this.options.uppercase && !this.options.lowercase && !this.options.number && !this.options.special) {
             this.options.lowercase = true;