diff --git a/src/app/tools/password-generator.component.html b/src/app/tools/password-generator.component.html
index e7539976..365390fa 100644
--- a/src/app/tools/password-generator.component.html
+++ b/src/app/tools/password-generator.component.html
@@ -10,15 +10,12 @@
     </div>
 </div>
 <div class="form-group">
-    <div class="form-check form-check-inline">
-        <input id="generate-password" name="type" value="password" class="form-check-input" type="radio"
-            (change)="saveOptions()" [(ngModel)]="options.type">
-        <label for="generate-password" class="form-check-label">{{'password' | i18n}}</label>
-    </div>
-    <div class="form-check form-check-inline">
-        <input id="generate-passphrase" name="type" value="passphrase" class="form-check-input" type="radio"
-            (change)="saveOptions()" [(ngModel)]="options.type">
-        <label for="generate-passphrase" class="form-check-label">{{'passphrase' | i18n}}</label>
+    <div class="form-check form-check-inline" *ngFor="let o of passTypeOptions">
+        <input class="form-check-input" type="radio" [(ngModel)]="options.type" name="Type_{{o.value}}"
+            id="type_{{o.value}}" [value]="o.value" (change)="saveOptions()" [checked]="options.type === o.value">
+        <label class="form-check-label" for="type_{{o.value}}">
+            {{o.name}}
+        </label>
     </div>
 </div>
 <ng-container *ngIf="options.type === 'passphrase'">