diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.html b/client/src/app/shared/shared-forms/dynamic-form-field.component.html
index 8e9ef5355..c228069b5 100644
--- a/client/src/app/shared/shared-forms/dynamic-form-field.component.html
+++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.html
@@ -1,5 +1,12 @@
 <div [formGroup]="form">
-  <label *ngIf="setting.label" [attr.for]="setting.name" [innerHTML]="setting.label"></label>
+  <label *ngIf="setting.label && setting.type !== 'input-checkbox'" [attr.for]="setting.name" [innerHTML]="setting.label"></label>
+
+  <my-peertube-checkbox
+    *ngIf="setting.type === 'input-checkbox'"
+    [inputName]="setting.name"
+    [formControlName]="setting.name"
+    [labelInnerHTML]="setting.label"
+  ></my-peertube-checkbox>
 
   <div *ngIf="setting.descriptionHTML" class="label-small-info" [innerHTML]="setting.descriptionHTML"></div>
 
@@ -31,13 +38,6 @@
     [classes]="{ 'input-error': formErrors['settings.name'] }"
   ></my-markdown-textarea>
 
-  <my-peertube-checkbox
-    *ngIf="setting.type === 'input-checkbox'"
-    [inputName]="setting.name"
-    [formControlName]="setting.name"
-    [labelInnerHTML]="setting.label"
-  ></my-peertube-checkbox>
-
   <div *ngIf="setting.type === 'html'" [innerHTML]="setting.html"></div>
 
   <div *ngIf="formErrors[setting.name]" class="form-error">
diff --git a/client/src/app/shared/shared-forms/dynamic-form-field.component.scss b/client/src/app/shared/shared-forms/dynamic-form-field.component.scss
index 89193ed85..45ba28951 100644
--- a/client/src/app/shared/shared-forms/dynamic-form-field.component.scss
+++ b/client/src/app/shared/shared-forms/dynamic-form-field.component.scss
@@ -22,3 +22,7 @@ textarea {
   margin-bottom: 10px;
   font-size: 13px;
 }
+
+my-peertube-checkbox + .label-small-info {
+  margin-top: 5px;
+}