diff --git a/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html b/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html
index 6ff4263abe79458e75124974e9000adf4613785f..1b8452463d051df8a5f93404d4a0850900c7d77b 100644
--- a/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html
+++ b/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html
@@ -5,7 +5,7 @@
 >
   <div class="title">
     <h3>Souhaitez-vous vous abonner à la lettre d’information de Res'in&nbsp;?</h3>
-    <p class="notRequired" *ngIf="!isEditMode">Facultatif</p>
+    <p *ngIf="!isEditMode">Facultatif</p>
   </div>
   <app-checkbox-form
     [isChecked]="userAcceptNewsletter"
diff --git a/src/app/form/form-view/form-view.component.ts b/src/app/form/form-view/form-view.component.ts
index 967976283b9d38cb2bc6f0b1c174420b470eaa57..411eca0854b6265a7be48bac5f56183b53c2a5de 100644
--- a/src/app/form/form-view/form-view.component.ts
+++ b/src/app/form/form-view/form-view.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, SimpleChanges } from '@angular/core';
-import { FormGroup, FormControl, Validators, FormArray } from '@angular/forms';
+import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { forkJoin, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
@@ -144,7 +144,8 @@ export class FormViewComponent implements OnInit {
     }
     if (formType[this.routeParam] === formType.structure) {
       if (!this.isEditMode) {
-        this.nbSteps = 24;
+        const PAGE_WITHOUT_COUNT_INCREMENT = 2;
+        this.nbSteps = structureFormSteps - PAGE_WITHOUT_COUNT_INCREMENT;
         this.currentPage = structureFormStep.structureChoice;
         this.currentFormType = formType.structure;
         this.structure = new Structure();
diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html
index aee6164bf7a11c13e558d26668f266bd7698662f..a145437ce4d217b762dbdfb976d805c68cf89879 100644
--- a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html
+++ b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html
@@ -2,7 +2,7 @@
   <div class="title">
     <p class="overtitle">{{ structureName }}</p>
     <h3>Quelles aides au numérique proposez-vous&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+    <p>Facultatif</p>
   </div>
 
   <div fxLayout="column" fxLayoutGap="32px">
diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html
index f6458cd9a4d79cd7db7cf9ff21c27b8ae2bbef72..55da9d4e9f7e6136cbdfcc30202400c71e974864 100644
--- a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html
+++ b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html
@@ -2,7 +2,7 @@
   <div class="title">
     <p class="overtitle">{{ structureName }}</p>
     <h3>Quelles formations au numérique proposez-vous&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+    <p>Facultatif</p>
   </div>
   <app-training-type-picker
     [baseSkills]="personalOfferForm.get('baseSkills').value"
diff --git a/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html b/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html
index f0496ea7eb5599e28dfced0415ab260e1bf41756..5590c3fae2824c93daef9827eba12872798763c1 100644
--- a/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html
+++ b/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html
@@ -26,7 +26,7 @@
           data.grandlyon.com<span class="asterisk" *ngIf="!isEditMode">**</span
           ><span class="asterisk" *ngIf="isEditMode">*</span> ?
         </h3>
-        <p class="notRequired" *ngIf="!isEditMode">Facultatif</p>
+        <p *ngIf="!isEditMode">Facultatif</p>
       </div>
     </div>
     <app-checkbox-form
diff --git a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
index aaf7f91daf3900c5f6b9123d45c9c8edc08703fa..ad503c002d02510414342df84ed1033a72d57d7a 100644
--- a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
+++ b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>Y a-t-il des informations spécifiques à la période COVID&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <div class="textareaBlock" fxLayout="column">
diff --git a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
index 88b371d399e51e24c982aaacd34fc8a56cb29be3..b15ecf3c7b72f779d75c0a3e4574f5085b7b4aab 100644
--- a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
+++ b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>Pouvez-vous présenter la structure en quelques mots&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <div class="textareaBlock introduceStructure" fxLayout="column">
diff --git a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
index 771b5c356f0c4b4d9c6411056bad8a0e9ed7e568..b060ca580afb551d5a0af922a741280be0f110c4 100644
--- a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
+++ b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>Quel matériel est mis à disposition par la structure&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <ng-container *ngFor="let equipment of equipmentsAndServices">
diff --git a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
index 40cccf9a6f3cfc98dce4a06e1fc9c2bcea2e4367..3f2ae9fc925a09d681944f427a639c8b40814aa1 100644
--- a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
+++ b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>Quels sont les horaires d'ouverture de la structure&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <app-hour-picker
@@ -21,7 +21,7 @@
 
   <div class="title secondTitle">
     <h3>Avez-vous des précisions à apporter sur les horaires&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+    <p>Facultatif</p>
   </div>
   <div class="textareaBlock" fxLayout="column">
     <textarea
diff --git a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html
index 47f65e87f658afe2afed6d6d2aa75c4d64423bcd..40530a34d15f74aada4552a4b7bd966c32ad8e2e 100644
--- a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html
+++ b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>La structure est-elle labellisée&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <div class="labelsQualifications" *ngIf="labelsQualifications" fxLayout="row wrap" fxLayoutAlign="flex-start">
diff --git a/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html b/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html
index 3b4bc5aae2a64e3539c34241b9949cbc81b45475..623537c72d92a6abe8307e43b0b44175ceccc61a 100644
--- a/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html
+++ b/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>Quels autres services sont proposés par la structure&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <div *ngIf="equipmentsAndServices" fxLayout="column wrap" fxLayoutAlign="flex-start" class="otherServices">
diff --git a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html
index c7007b058d30c65df00a3abd1a516ec9becca1f0..accbc729b84096dcf64039669e73ce248db53b20 100644
--- a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html
+++ b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>Quelles formations au numérique proposez-vous&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <app-training-type-picker
diff --git a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
index c6187d89f71428765ef1d1f6a58dc7836452838e..c0e2c6a162e301725f8d502a0f8c607ac904313b 100644
--- a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
+++ b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
@@ -9,7 +9,7 @@
     ></app-svg-icon>
     <div class="titleContent">
       <h3>Comment vous trouver la structure sur internet&nbsp;?</h3>
-      <p class="notRequired">Facultatif</p>
+      <p>Facultatif</p>
     </div>
   </div>
   <div class="collapse" [ngClass]="{ notCollapsed: !showWebsite }">