diff --git a/src/app/features/administration/form/steps/step-one/step-one.component.html b/src/app/features/administration/form/steps/step-one/step-one.component.html
index 84940902..9d0b3562 100644
--- a/src/app/features/administration/form/steps/step-one/step-one.component.html
+++ b/src/app/features/administration/form/steps/step-one/step-one.component.html
@@ -84,6 +84,7 @@
 <app-nav-steps
 	[display_previous_button]="false"
 	[display_next_button]="true"
+	[next_is_disabled]="!pollService.form.value.title"
 	[next_step_number]="pollService.step_current + 1"
 	[previous_step_number]="pollService.step_current - 1"
 ></app-nav-steps>
diff --git a/src/app/features/administration/form/steps/step-six/step-six.component.html b/src/app/features/administration/form/steps/step-six/step-six.component.html
index a97f4e0c..5353b915 100644
--- a/src/app/features/administration/form/steps/step-six/step-six.component.html
+++ b/src/app/features/administration/form/steps/step-six/step-six.component.html
@@ -25,4 +25,5 @@
 <app-nav-steps
 	[next_step_number]="pollService.step_current + 1"
 	[previous_step_number]="pollService.step_current - 1"
+	[next_is_disabled]="!pollService.form.value.creatorEmail || !pollService.form.value.creatorPseudo"
 ></app-nav-steps>
diff --git a/src/app/features/administration/nav-steps/nav-steps.component.html b/src/app/features/administration/nav-steps/nav-steps.component.html
index 1c09955c..5344de30 100644
--- a/src/app/features/administration/nav-steps/nav-steps.component.html
+++ b/src/app/features/administration/nav-steps/nav-steps.component.html
@@ -12,6 +12,7 @@
 		<button
 			*ngIf="display_next_button"
 			class="button-next pull-right"
+			[disabled]="next_is_disabled"
 			[attr.aria-label]="(is_finish_step ? 'nav.save' : 'nav.next') | translate"
 			[ngClass]="{ 'is-finish': is_finish_step, 'is-primary': !is_finish_step }"
 			[routerLink]="['/administration/step/' + next_step_number]"
diff --git a/src/app/features/administration/nav-steps/nav-steps.component.ts b/src/app/features/administration/nav-steps/nav-steps.component.ts
index 340c9585..5195475e 100644
--- a/src/app/features/administration/nav-steps/nav-steps.component.ts
+++ b/src/app/features/administration/nav-steps/nav-steps.component.ts
@@ -23,6 +23,8 @@ export class NavStepsComponent implements OnInit {
 	 */
 	@Input()
 	actionBeforeNextStep: Function;
+	@Input()
+	next_is_disabled: any = false;
 
 	constructor(private router: Router, public pollService: PollService) {}