diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index 68449c75..ed9ba9ab 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -38,7 +38,7 @@ export class PollService implements Resolve<Poll> {
 	public previousRouteName: string = '/administration';
 	public nextRouteName: string = '/administration/step/2';
 	public step_current: number = 1;
-	public step_max: number = 5;
+	public step_max: number = 7;
 	public round: Function;
 	public pass_hash: string;
 	public admin_key: string;
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 c4748c30..7ea94a48 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
@@ -1,13 +1,31 @@
-<app-stepper [step_current]="5" [step_max]="5"></app-stepper>
+<app-stepper [step_current]="5" [step_max]="pollService.step_max"></app-stepper>
 <app-errors-list [form]="pollService.form"></app-errors-list>
-<app-success [poll]="pollService.form.value"></app-success>
+<!--<app-success [poll]="pollService.form.value"></app-success>-->
 
 <section class="supplement container">
+	<fieldset class="advanced-config">
+		<button
+			class="button is-unchecked-info"
+			[ngClass]="{ 'is-info': !advancedDisplayEnabled, 'is-primary': advancedDisplayEnabled }"
+			(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
+		>
+			<i class="fa fa-chevron-circle-down" *ngIf="!advancedDisplayEnabled"></i>
+			<i class="fa fa-chevron-circle-up" *ngIf="advancedDisplayEnabled"></i>
+			{{ 'creation.advanced' | translate }}
+		</button>
+		<fieldset class="complete well" *ngIf="advancedDisplayEnabled">
+			<app-advanced-config [form]="pollService.form"></app-advanced-config>
+		</fieldset>
+	</fieldset>
 	<div class="columns">
 		<div class="column">
-			<button class="button is-primary is-fullwidth" [routerLink]="['/administration/step/1']">
-				<i class="fa fa-pencil"></i>
-				modifier le sondage
+			<button class="button is-default is-fullwidth" [routerLink]="['/administration/step/4']">
+				Précédent
+			</button>
+		</div>
+		<div class="column">
+			<button class="button is-primary is-fullwidth" [routerLink]="['/administration/step/6']">
+				Suivant
 			</button>
 		</div>
 	</div>
diff --git a/src/app/features/administration/form/steps/step-five/step-five.component.ts b/src/app/features/administration/form/steps/step-five/step-five.component.ts
index c7e8fd33..67ea01ee 100644
--- a/src/app/features/administration/form/steps/step-five/step-five.component.ts
+++ b/src/app/features/administration/form/steps/step-five/step-five.component.ts
@@ -12,6 +12,7 @@ export class StepFiveComponent implements OnInit {
 	@Input() step_max: any;
 	@Input() public form: FormGroup;
 	poll: any;
+	advancedDisplayEnabled = true;
 	constructor(public pollService: PollService) {
 		this.pollService.step_current = 5;
 	}
diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.html b/src/app/features/administration/form/steps/step-four/step-four.component.html
index 351f2f8e..742e9174 100644
--- a/src/app/features/administration/form/steps/step-four/step-four.component.html
+++ b/src/app/features/administration/form/steps/step-four/step-four.component.html
@@ -31,21 +31,6 @@
 					required
 				/>
 			</div>
-
-			<fieldset class="advanced-config">
-				<button
-					class="button is-unchecked-info"
-					[ngClass]="{ 'is-info': !advancedDisplayEnabled, 'is-primary': advancedDisplayEnabled }"
-					(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
-				>
-					<i class="fa fa-chevron-circle-down" *ngIf="!advancedDisplayEnabled"></i>
-					<i class="fa fa-chevron-circle-up" *ngIf="advancedDisplayEnabled"></i>
-					{{ 'creation.advanced' | translate }}
-				</button>
-				<fieldset class="complete well" *ngIf="advancedDisplayEnabled">
-					<app-advanced-config [form]="pollService.form"></app-advanced-config>
-				</fieldset>
-			</fieldset>
 		</form>
 	</div>
 	<div class="columns">
@@ -60,7 +45,6 @@
 				[routerLink]="['/administration/step/5']"
 				[disabled]="!pollService.form.valid"
 			>
-				<i class="fa fa-save"></i>
 				Suivant
 			</button>
 		</div>
diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html
index 00834474..ab944488 100644
--- a/src/app/features/administration/success/success.component.html
+++ b/src/app/features/administration/success/success.component.html
@@ -18,7 +18,7 @@
 						n'a pas été créé :(
 
 						<br />
-						<button class="button is-primary" [routerLink]="['/administration/step/4']">
+						<button class="button is-primary" [routerLink]="['/administration/step/7']">
 							Revenir en arrière
 						</button>
 					</span>
@@ -33,7 +33,7 @@
 <div class="container padded">
 	<div class=" ">
 		<div class="main-block">
-			<div class="columns">
+			<div class="hopla">
 				<div class="column">
 					<div class="admin">
 						<div class="no-admin-key padded has-background-danger" *ngIf="!pollService.admin_key">
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index a8192321..a3dace21 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -11,7 +11,7 @@ export const environment = {
 	frontDomain: 'http://127.0.0.1:4200',
 	production: false,
 	display_routes: false, // demo paths to test polls
-	autofill_creation: false,
+	autofill_creation: true,
 	advanced_options_display: false,
 	autofill_participation: false,
 	showDemoWarning: false,