diff --git a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
index bde67e1c7..5960c79f7 100644
--- a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
@@ -25,48 +25,13 @@
         </div>
       </div>
 
-      <div class="form-group">
+      <div class="form-group" *ngIf="form.controls.enableHeaderAuth.value">
         <label for="headerAuthVariable" class="control-label">Header Authentication Variable</label>
         <div>
           <input type="text" class="form-control form-control-custom " id="headerAuthVariable" name="headerAuthVariable" formControlName="headerAuthVariable">
         </div>
       </div>
 
-      <!-- <hr/>
-  <div class="form-group">
-      <div class="checkbox">
-          <input type="checkbox" id="requiredDigit" name="requiredDigit" formControlName="requiredDigit">
-          <label for="requiredDigit">Require a digit in the password</label>
-      </div>
-  </div>
-
-  <div class="form-group">
-      <label for="requiredLength" class="control-label">Required password length</label>
-      <div>
-          <input type="text" class="form-control form-control-custom " id="requiredLength" name="requiredLength" formControlName="requiredLength">
-      </div>
-  </div>
-
-  <div class="form-group">
-      <div class="checkbox">
-          <input type="checkbox" id="requiredLowercase" name="requiredLowercase" formControlName="requiredLowercase">
-          <label for="requiredLowercase">Require a lowercase character in the password</label>
-      </div>
-  </div>
-
-  <div class="form-group">
-      <div class="checkbox">
-          <input type="checkbox" id="requireNonAlphanumeric" name="requireNonAlphanumeric" formControlName="requireNonAlphanumeric">
-          <label for="requireNonAlphanumeric">Require a NonAlphanumeric character in the password</label>
-      </div>
-  </div>
-
-  <div class="form-group">
-      <div class="checkbox">
-          <input type="checkbox" id="requireUppercase" name="requireUppercase" formControlName="requireUppercase">
-          <label for="requireUppercase">Require a uppercase character in the password</label>
-      </div>
-  </div> -->
 
       <div class="form-group">
         <div>
diff --git a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts
index 386711c4f..100a502b3 100644
--- a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from "@angular/core";
-import { FormBuilder, FormGroup } from "@angular/forms";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 
 import { NotificationService } from "../../services";
 import { SettingsService } from "../../services";
@@ -29,7 +29,17 @@ export class AuthenticationComponent implements OnInit {
                 enableHeaderAuth: [x.enableHeaderAuth],
                 headerAuthVariable: [x.headerAuthVariable],
             });
+            this.form.controls.enableHeaderAuth.valueChanges.subscribe(x => {
+                if (x) {
+                    this.form.get("headerAuthVariable").setValidators(Validators.required);
+                } else {
+                    this.form.get("headerAuthVariable").clearValidators();
+                }
+                this.form.get("headerAuthVariable").updateValueAndValidity();
+            });
         });
+
+
     }
 
     public onSubmit(form: FormGroup) {