diff --git a/src/app/features/administration/form/steps/step-five/step-five.component.html b/src/app/features/administration/form/steps/step-five/step-five.component.html
index f602fd31..aecc075f 100644
--- a/src/app/features/administration/form/steps/step-five/step-five.component.html
+++ b/src/app/features/administration/form/steps/step-five/step-five.component.html
@@ -19,5 +19,7 @@
 </div>
 <app-nav-steps
 	[next_step_number]="pollService.step_current + 1"
-	[previous_step_number]="pollService.step_current - 1"
+	[previous_step_number]="
+		pollService.form.value.isAboutDate ? pollService.step_current - 1 : pollService.step_current - 2
+	"
 ></app-nav-steps>
diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.html b/src/app/features/administration/form/steps/step-three/step-three.component.html
index 711f6ed4..eb78cce8 100644
--- a/src/app/features/administration/form/steps/step-three/step-three.component.html
+++ b/src/app/features/administration/form/steps/step-three/step-three.component.html
@@ -43,6 +43,8 @@
 </div>
 <app-nav-steps
 	[actionBeforeNextStep]="convertDateInputs"
-	[next_step_number]="pollService.step_current + 1"
+	[next_step_number]="
+		pollService.form.value.isAboutDate ? pollService.step_current + 1 : pollService.step_current + 2
+	"
 	[previous_step_number]="pollService.step_current - 1"
 ></app-nav-steps>