diff --git a/src/components/ProfileType/ProfileTypeFinished.tsx b/src/components/ProfileType/ProfileTypeFinished.tsx
index 2b13b2826643c2f4ea09a26b32dec256cb35a5b5..12cefc0fefd2439390f231d5fcf77cd526d4f947 100644
--- a/src/components/ProfileType/ProfileTypeFinished.tsx
+++ b/src/components/ProfileType/ProfileTypeFinished.tsx
@@ -29,7 +29,12 @@ const ProfileTypeFinished: React.FC<ProfileTypeFinishedProps> = ({
     const consistentProfileType = ProfileTypeService.checkConsistency(
       profileType
     )
-    dispatch(updateProfile({ profileType: consistentProfileType }))
+    dispatch(
+      updateProfile({
+        profileType: consistentProfileType,
+        isProfileTypeCompleted: true,
+      })
+    )
   }, [dispatch, profileType])
 
   return (
diff --git a/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx b/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
index 5352040c858617b3bc27c6d0530567711f81cc45..039cd2a1c21e17ae3257f8e5c78228d9df24a610 100644
--- a/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
+++ b/src/components/ProfileType/ProfileTypeFormMultiChoice.tsx
@@ -44,10 +44,26 @@ const ProfileTypeFormMultiChoice: React.FC<ProfileTypeFormMultiChoiceProps> = ({
       remove(tempAnswer, function(n) {
         return n === 'none' || n === value
       })
+      remove(tempAnswer, function(n) {
+        return n === 'collective_heater' || n === value
+      })
+      remove(tempAnswer, function(n) {
+        return n === 'other' || n === value
+      })
+    } else if (value === 'collective_heater' && !tempAnswer.includes(value)) {
+      tempAnswer = [value]
+    } else if (value === 'other' && !tempAnswer.includes(value)) {
+      tempAnswer = [value]
     } else {
       remove(tempAnswer, function(n) {
         return n === 'none'
       })
+      remove(tempAnswer, function(n) {
+        return n === 'collective_heater'
+      })
+      remove(tempAnswer, function(n) {
+        return n === 'other'
+      })
       tempAnswer.push(value)
     }
     setAnswer(tempAnswer)
diff --git a/src/services/profileType.service.ts b/src/services/profileType.service.ts
index 6f6e61046d1113767d9bb3d4b06ff10afef7f23c..00a3c7dd4a1dc3ee0a5f66ba74db112410dbf04e 100644
--- a/src/services/profileType.service.ts
+++ b/src/services/profileType.service.ts
@@ -623,7 +623,7 @@ export default class ProfileTypeService {
         }
       case ProfileTypeStepForm.HOT_WATER_EQUIPMENT:
         return {
-          type: ProfileTypeFormType.SINGLE_CHOICE,
+          type: ProfileTypeFormType.MULTI_CHOICE,
           attribute: 'hotWaterEquipment',
           choices: Object.values(HotWaterEquipment),
         }