diff --git a/src/app/tools/password-generator.component.html b/src/app/tools/password-generator.component.html
index a28037cb..2ef7cc8e 100644
--- a/src/app/tools/password-generator.component.html
+++ b/src/app/tools/password-generator.component.html
@@ -18,28 +18,32 @@
         <label for="generate-passphrase" class="form-check-label">{{'passphrase' | i18n}}</label>
     </div>
 </div>
-<div class="row" *ngIf="options.type === 'passphrase'">
-    <div class="form-group col-4">
-        <label for="num-words">{{'numWords' | i18n}}</label>
-        <input id="num-words" class="form-control" type="number" min="3" max="20" [(ngModel)]="options.numWords"
-            (blur)="saveOptions()">
+<ng-container *ngIf="options.type === 'passphrase'">
+    <div class="row">
+        <div class="form-group col-4">
+            <label for="num-words">{{'numWords' | i18n}}</label>
+            <input id="num-words" class="form-control" type="number" min="3" max="20" [(ngModel)]="options.numWords"
+                (blur)="saveOptions()">
+        </div>
+        <div class="form-group col-4">
+            <label for="word-separator">{{'wordSeparator' | i18n}}</label>
+            <input id="word-separator" class="form-control" type="text" maxlength="1"
+                [(ngModel)]="options.wordSeparator" (blur)="saveOptions()">
+        </div>
     </div>
-    <div class="form-group col-4">
-        <label for="word-separator">{{'wordSeparator' | i18n}}</label>
-        <input id="word-separator" class="form-control" type="text" maxlength="1" [(ngModel)]="options.wordSeparator"
-            (blur)="saveOptions()">
+    <div class="form-group">
+        <div class="form-check">
+            <input id="capitalize" class="form-check-input" type="checkbox" (change)="saveOptions()"
+                [(ngModel)]="options.capitalize">
+            <label for="capitalize" class="form-check-label">{{'capitalize' | i18n}}</label>
+        </div>
+        <div class="form-check">
+            <input id="include-number" class="form-check-input" type="checkbox" (change)="saveOptions()"
+                [(ngModel)]="options.includeNumber">
+            <label for="include-number" class="form-check-label">{{'includeNumber' | i18n}}</label>
+        </div>
     </div>
-    <div class="form-check">
-        <input id="capitalize" class="form-check-input" type="checkbox" (change)="saveOptions()"
-            [(ngModel)]="options.capitalize">
-        <label for="capitalize" class="form-check-label">{{'capitalize' | i18n}}</label>
-    </div>
-    <div class="form-check">
-        <input id="include-number" class="form-check-input" type="checkbox" (change)="saveOptions()"
-            [(ngModel)]="options.includeNumber">
-        <label for="include-number" class="form-check-label">{{'includeNumber' | i18n}}</label>
-    </div>
-</div>
+</ng-container>
 <ng-container *ngIf="options.type === 'password'">
     <div class="row">
         <div class="form-group col-4">