diff --git a/src/app/modules/configuration/config-editor.html b/src/app/modules/configuration/config-editor.html
index 11982bc..9bb90b6 100644
--- a/src/app/modules/configuration/config-editor.html
+++ b/src/app/modules/configuration/config-editor.html
@@ -4,7 +4,7 @@
       <cre-primary-button routerLink="/color">Retour</cre-primary-button>
     </cre-action-group>
     <cre-action-group>
-      <cre-accent-button type="submit" (click)="onSubmit()">Enregistrer</cre-accent-button>
+      <cre-accent-button [disabled]="!(form.dirty && form.valid)" (click)="onSubmit()">Enregistrer</cre-accent-button>
     </cre-action-group>
   </cre-action-bar>
 
diff --git a/src/app/modules/configuration/config-editor.ts b/src/app/modules/configuration/config-editor.ts
index b6d7a67..bde9502 100644
--- a/src/app/modules/configuration/config-editor.ts
+++ b/src/app/modules/configuration/config-editor.ts
@@ -47,6 +47,10 @@ export class CreConfigEditor extends ErrorHandlingComponent {
     this.fetchConfigurations(formBuilder)
   }
 
+  ngOnInit() {
+    super.ngOnInit()
+  }
+
   getConfigControl(key: string): ConfigControl {
     return {
       config: this.configs.get(key),
diff --git a/src/app/modules/shared/model/config.model.ts b/src/app/modules/shared/model/config.model.ts
index edbd0f8..02e4923 100644
--- a/src/app/modules/shared/model/config.model.ts
+++ b/src/app/modules/shared/model/config.model.ts
@@ -46,7 +46,7 @@ export class ConfigControl {
 }
 
 export function buildFormControl(config: Config): AbstractControl {
-  return new FormControl({value: config.content, disabled: !config.editable}, Validators.required)
+  return new FormControl({value: config.content, disabled: !config.editable}, !configKeyIsPassword(config.key) ? Validators.required : null)
 }
 
 export function configKeyIsPassword(key: string): boolean {