diff --git a/client/src/app/shared/forms/form-reactive.ts b/client/src/app/shared/forms/form-reactive.ts
index 0d40b6f4a..6aec2937d 100644
--- a/client/src/app/shared/forms/form-reactive.ts
+++ b/client/src/app/shared/forms/form-reactive.ts
@@ -57,7 +57,7 @@ export abstract class FormReactive {
 
       // Don't care if dirty on force check
       const isDirty = control.dirty || forceCheck === true
-      if (control && isDirty && !control.valid) {
+      if (control && isDirty && control.enabled && !control.valid) {
         const messages = validationMessages[ field ]
         for (const key of Object.keys(control.errors)) {
           formErrors[ field ] += messages[ key ] + ' '
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index c80efd802..8345645f6 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -189,7 +189,7 @@ export class VideoEditComponent implements OnInit, OnDestroy {
   }
 
   private trackPrivacyChange () {
-    // We will update the "support" field depending on the channel
+    // We will update the schedule input and the wait transcoding checkbox validators
     this.form.controls[ 'privacy' ]
       .valueChanges
       .pipe(map(res => parseInt(res.toString(), 10)))