diff --git a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
index f97c34100e39f31b2a1087bf03c687c31abcef47..53a744e82f0fe7a5f6d4fce4dcb102ca2a1f741f 100644
--- a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
+++ b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
@@ -55,7 +55,7 @@ const EcogestureFormSingleChoice = ({
           )}
         </div>
         {answerType.choices.map(value => {
-          if (!value) return null
+          if (value === null) return null
           return (
             <label
               key={value.toString()}
diff --git a/src/components/EcogestureForm/EcogestureFormView.tsx b/src/components/EcogestureForm/EcogestureFormView.tsx
index 180018ebb9d6ef065610355337c4fa4249c5b554..2f0afefaf78205a26cb10d9a55195d4c840a2407 100644
--- a/src/components/EcogestureForm/EcogestureFormView.tsx
+++ b/src/components/EcogestureForm/EcogestureFormView.tsx
@@ -102,6 +102,7 @@ const EcogestureFormView = () => {
       </Content>
     )
   }
+
   return (
     <>
       <CozyBar titleKey={'common.title_ecogestures'} />
diff --git a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
index d48e92b70bf84253137e4b89a2e7633888977459..7487597c3da3c723abaa9bdf9e9127ad9ab04398 100644
--- a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
+++ b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
@@ -77,7 +77,7 @@ const ProfileTypeFormSingleChoice = ({
           )}
         </div>
         {answerType.choices.map((value, index) => {
-          if (!value && value !== 0) return null
+          if (value === null) return null
 
           return (
             <label
diff --git a/src/enum/ecogestureForm.enum.ts b/src/enum/ecogestureForm.enum.ts
index 3e847a32533a511af712846712647aa6a2af3bf5..4caa98b55d110aad5e71c4c47a853eb45f413f5f 100644
--- a/src/enum/ecogestureForm.enum.ts
+++ b/src/enum/ecogestureForm.enum.ts
@@ -1,7 +1,7 @@
 export enum EcogestureStepForm {
   HEATING_TYPE = 0,
   WARMING_FLUID = 1,
-  HOT_WATER_TYPE = 2,
+  HOT_WATER = 2,
   EQUIPMENTS = 3,
   END,
 }
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 33bb09489a854a882f24fe45074d2874a6e8e396..3e3eec59e96d629c5fd89cb5d8ba131f7454347c 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -512,13 +512,20 @@
     },
     "warming_fluid": {
       "title": "Source chauffage",
-      "question": "Quelle source d’énergie principale utilisez-vous pour votre chauffage\u00a0?",
+      "question": "Quelle source d’énergie principale utilisez-vous pour vous chauffer\u00a0?",
       "0": "Électricité",
       "2": "Gaz",
       "3": "Bois",
-      "4": "Fioul"
+      "4": "Fioul",
+      "5": "Autre",
+      "no_fluid_text": "Produit ni par de l'électricité, ni par du gaz, ni par du bois ou du fuel",
+      "0_text": "Produit grâce à de l'électricité",
+      "2_text": "Produit grâce au gaz",
+      "3_text": "Produit grâce au bois",
+      "4_text": "Produit grâce au fioul",
+      "5_text": "Produit grâce à un autre moyen"
     },
-    "hot_water_type": {
+    "hot_water": {
       "title": "Eau chaude",
       "question": "Quel est votre type de production d’eau chaude\u00a0?",
       "individual": "Individuelle",
diff --git a/src/services/profileEcogestureForm.service.ts b/src/services/profileEcogestureForm.service.ts
index 0da0d9ead5ad4974b4fb06fa4a4809cabe62a547..0e3aae75a43dc394e026ad91c5bc0b2edc12129a 100644
--- a/src/services/profileEcogestureForm.service.ts
+++ b/src/services/profileEcogestureForm.service.ts
@@ -28,10 +28,10 @@ export default class ProfileEcogestureFormService {
         return this.profileEcogesture.heating ===
           IndividualOrCollective.INDIVIDUAL
           ? EcogestureStepForm.WARMING_FLUID
-          : EcogestureStepForm.HOT_WATER_TYPE
+          : EcogestureStepForm.HOT_WATER
       case EcogestureStepForm.WARMING_FLUID:
-        return EcogestureStepForm.HOT_WATER_TYPE
-      case EcogestureStepForm.HOT_WATER_TYPE:
+        return EcogestureStepForm.HOT_WATER
+      case EcogestureStepForm.HOT_WATER:
         return EcogestureStepForm.EQUIPMENTS
       case EcogestureStepForm.EQUIPMENTS:
         return EcogestureStepForm.END
@@ -48,8 +48,8 @@ export default class ProfileEcogestureFormService {
   public getPreviousFormStep(step: EcogestureStepForm): EcogestureStepForm {
     switch (step) {
       case EcogestureStepForm.EQUIPMENTS:
-        return EcogestureStepForm.HOT_WATER_TYPE
-      case EcogestureStepForm.HOT_WATER_TYPE:
+        return EcogestureStepForm.HOT_WATER
+      case EcogestureStepForm.HOT_WATER:
         return this.profileEcogesture.heating ===
           IndividualOrCollective.INDIVIDUAL
           ? EcogestureStepForm.WARMING_FLUID
@@ -77,9 +77,10 @@ export default class ProfileEcogestureFormService {
             WarmingType.GAS,
             WarmingType.WOOD,
             WarmingType.FUEL,
+            WarmingType.OTHER,
           ],
         }
-      case EcogestureStepForm.HOT_WATER_TYPE:
+      case EcogestureStepForm.HOT_WATER:
         return {
           type: ProfileEcogestureAnswerType.SINGLE_CHOICE,
           attribute: 'hotWater',