diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index de081aebc2..445d849785 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -188,7 +188,7 @@
                         <label for="favorite">{{'favorite' | i18n}}</label>
                         <input id="favorite" type="checkbox" name="Favorite" [(ngModel)]="cipher.favorite">
                     </div>
-                    <a class="box-content-row box-content-row-flex" href="#" appStopClick appBlurClick
+                    <a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
                        (click)="attachments()" *ngIf="editMode">
                         <div class="row-main">{{'attachments' | i18n}}</div>
                         <i class="fa fa-chevron-right row-sub-icon"></i>
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index a1b86409b4..915a3f23d2 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -5,11 +5,11 @@
                 <div class="password-block">{{password}}</div>
                 <div class="box">
                     <div class="box-content condensed">
-                        <a class="box-content-row text-primary" href="#" appStopClick appBlurClick
+                        <a class="box-content-row" href="#" appStopClick appBlurClick
                            (click)="regenerate(true)">
                             <i class="fa fa-fw fa-refresh"></i> {{'regeneratePassword' | i18n}}
                         </a>
-                        <a class="box-content-row text-primary" href="#" appStopClick appBlurClick
+                        <a class="box-content-row" href="#" appStopClick appBlurClick
                            (click)="copy()">
                             <i class="fa fa-fw fa-clipboard"></i> {{'copyPassword' | i18n}}
                         </a>
diff --git a/src/app/vault/password-generator.component.ts b/src/app/vault/password-generator.component.ts
index caef99cf94..2bf82b5e5c 100644
--- a/src/app/vault/password-generator.component.ts
+++ b/src/app/vault/password-generator.component.ts
@@ -93,11 +93,19 @@ export class PasswordGeneratorComponent implements OnInit {
         }
         if (!this.options.minNumber) {
             this.options.minNumber = 0;
+        } else if (this.options.minNumber > 5) {
+            this.options.minNumber = 5;
         }
+
         if (!this.options.minSpecial) {
             this.options.minSpecial = 0;
+        } else if (this.options.minSpecial > 5) {
+            this.options.minSpecial = 5;
         }
-        if (this.options.length > 128) {
+
+        if (!this.options.length) {
+            this.options.length = 5;
+        } else if (this.options.length > 128) {
             this.options.length = 128;
         }
     }
diff --git a/src/scss/box.scss b/src/scss/box.scss
index beff84011e..94cf6a1f1d 100644
--- a/src/scss/box.scss
+++ b/src/scss/box.scss
@@ -26,7 +26,6 @@
             padding: 10px 15px;
             position: relative;
             z-index: 1;
-            color: $text-color;
             overflow-wrap: break-word;
             word-break: break-all;
 
diff --git a/src/scss/misc.scss b/src/scss/misc.scss
index 9d5c6c63b2..50345ad044 100644
--- a/src/scss/misc.scss
+++ b/src/scss/misc.scss
@@ -8,6 +8,10 @@
     color: $text-muted !important;
 }
 
+.text-default {
+    color: $text-color !important;
+}
+
 .text-center {
     text-align: center;
 }