diff --git a/assets/json/Signalement/desordres_profile_occupant.json b/assets/json/Signalement/desordres_profile_occupant.json
index baf0bfb97..1e4ada744 100644
--- a/assets/json/Signalement/desordres_profile_occupant.json
+++ b/assets/json/Signalement/desordres_profile_occupant.json
@@ -45,8 +45,7 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_les_desordres_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -297,8 +296,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_proprete_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -373,8 +371,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -460,8 +457,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_isolation_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -531,8 +527,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_maintenance_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -651,8 +646,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -875,8 +869,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -935,8 +928,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_incendie_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1045,8 +1037,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_accessibilite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1105,8 +1096,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1403,8 +1393,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1517,8 +1506,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_aeration_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1749,8 +1737,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_chauffage_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2089,8 +2076,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_humidite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2264,8 +2250,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2389,8 +2374,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_electricite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2595,8 +2579,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2673,8 +2656,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2751,8 +2733,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_lumiere_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2814,8 +2795,7 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.hasDesordre('desordres_') === false"
-                },
-                "validOnEnter": true
+                }
               },
               {
                 "type": "SignalementFormButton",
@@ -2835,8 +2815,7 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.hasDesordre('desordres_') === true"
-                },
-                "validOnEnter": true
+                }
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/desordres_profile_tiers.json b/assets/json/Signalement/desordres_profile_tiers.json
index 70721ad8a..55338474c 100644
--- a/assets/json/Signalement/desordres_profile_tiers.json
+++ b/assets/json/Signalement/desordres_profile_tiers.json
@@ -45,8 +45,7 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_les_desordres_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -310,8 +309,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_proprete_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -386,8 +384,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -473,8 +470,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_isolation_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -544,8 +540,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_maintenance_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -664,8 +659,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -888,8 +882,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -948,8 +941,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_incendie_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1058,8 +1050,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_accessibilite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1118,8 +1109,7 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1425,8 +1415,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1543,8 +1532,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_aeration_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1775,8 +1763,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_chauffage_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2046,8 +2033,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_humidite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2221,8 +2207,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2350,8 +2335,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_electricite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2572,8 +2556,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2650,8 +2633,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2728,8 +2710,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_lumiere_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2777,8 +2758,7 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_proprete_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -2840,8 +2820,7 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "(formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_particulier' || formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_pro' || formStore.data.signalement_concerne_profil_detail_tiers === 'bailleur') && formStore.hasDesordre('desordres_') === false"
-                },
-                "validOnEnter": true
+                }
               },
               {
                 "type": "SignalementFormButton",
@@ -2851,8 +2830,7 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'service_secours' && formStore.hasDesordre('desordres_') === false"
-                },
-                "validOnEnter": true
+                }
               },
               {
                 "type": "SignalementFormButton",
@@ -2872,8 +2850,7 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.hasDesordre('desordres_') === true"
-                },
-                "validOnEnter": true
+                }
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_bailleur.json b/assets/json/Signalement/questions_profile_bailleur.json
index 6aea61599..b14c30a1e 100644
--- a/assets/json/Signalement/questions_profile_bailleur.json
+++ b/assets/json/Signalement/questions_profile_bailleur.json
@@ -75,8 +75,7 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -160,8 +159,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -231,8 +229,7 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -413,8 +410,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -508,8 +504,7 @@
                 "type": "SignalementFormButton",
                 "label": "Suivant",
                 "slug": "composition_logement_next",
-                "action": "goto.save:type_logement_commodites",
-                "validOnEnter": true
+                "action": "goto.save:type_logement_commodites"
               },
               {
                 "type": "SignalementFormButton",
@@ -723,8 +718,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -786,8 +780,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -939,8 +932,7 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -978,8 +970,7 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1088,8 +1079,7 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1187,8 +1177,7 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1309,8 +1298,7 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1364,8 +1352,7 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1550,8 +1537,7 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1591,8 +1577,7 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_bailleur_occupant.json b/assets/json/Signalement/questions_profile_bailleur_occupant.json
index 03fb0830d..b45094878 100644
--- a/assets/json/Signalement/questions_profile_bailleur_occupant.json
+++ b/assets/json/Signalement/questions_profile_bailleur_occupant.json
@@ -94,8 +94,7 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_occupant_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -165,8 +164,7 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -347,8 +345,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -442,8 +439,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -657,8 +653,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -720,8 +715,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -803,8 +797,7 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -842,8 +835,7 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -968,8 +960,7 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1041,8 +1032,7 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1182,8 +1172,7 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1237,8 +1226,7 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1366,8 +1354,7 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1407,8 +1394,7 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_locataire.json b/assets/json/Signalement/questions_profile_locataire.json
index 4bfbc99f5..7d0c9b2d7 100644
--- a/assets/json/Signalement/questions_profile_locataire.json
+++ b/assets/json/Signalement/questions_profile_locataire.json
@@ -79,8 +79,7 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_occupant_next",
                 "action": "goto.save:coordonnees_bailleur",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -201,8 +200,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -272,8 +270,7 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -454,8 +451,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -549,8 +545,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -764,8 +759,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -827,8 +821,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -986,8 +979,7 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1025,8 +1017,7 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1151,8 +1142,7 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1238,8 +1228,7 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1404,8 +1393,7 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1464,8 +1452,7 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1604,8 +1591,7 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1645,8 +1631,7 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_service_secours.json b/assets/json/Signalement/questions_profile_service_secours.json
index 53e15ea40..405471969 100644
--- a/assets/json/Signalement/questions_profile_service_secours.json
+++ b/assets/json/Signalement/questions_profile_service_secours.json
@@ -75,8 +75,7 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -163,8 +162,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:coordonnees_bailleur",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -280,8 +278,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -351,8 +348,7 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -533,8 +529,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -629,8 +624,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -844,8 +838,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -892,8 +885,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1045,8 +1037,7 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1195,8 +1186,7 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1259,8 +1249,7 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1300,8 +1289,7 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_tiers_particulier.json b/assets/json/Signalement/questions_profile_tiers_particulier.json
index 447cbd563..3154fa54a 100644
--- a/assets/json/Signalement/questions_profile_tiers_particulier.json
+++ b/assets/json/Signalement/questions_profile_tiers_particulier.json
@@ -86,8 +86,7 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -171,8 +170,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:coordonnees_bailleur",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -288,8 +286,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -359,8 +356,7 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -541,8 +537,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -637,8 +632,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -852,8 +846,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -915,8 +908,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1068,8 +1060,7 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1107,8 +1098,7 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1217,8 +1207,7 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1316,8 +1305,7 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1466,8 +1454,7 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1526,8 +1513,7 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1681,8 +1667,7 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1722,8 +1707,7 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_tiers_pro.json b/assets/json/Signalement/questions_profile_tiers_pro.json
index 8e23e7549..a96205576 100644
--- a/assets/json/Signalement/questions_profile_tiers_pro.json
+++ b/assets/json/Signalement/questions_profile_tiers_pro.json
@@ -71,8 +71,7 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -156,8 +155,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:coordonnees_bailleur",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -270,8 +268,7 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -341,8 +338,7 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -523,8 +519,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -619,8 +614,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -834,8 +828,7 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -897,8 +890,7 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1050,8 +1042,7 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1089,8 +1080,7 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1199,8 +1189,7 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1309,8 +1298,7 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1459,8 +1447,7 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1519,8 +1506,7 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1674,8 +1660,7 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -1715,8 +1700,7 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_tous.json b/assets/json/Signalement/questions_profile_tous.json
index 23fa6b454..8814bf738 100644
--- a/assets/json/Signalement/questions_profile_tous.json
+++ b/assets/json/Signalement/questions_profile_tous.json
@@ -18,8 +18,7 @@
                 "label": "Je démarre",
                 "slug": "introduction_go",
                 "action": "goto:adresse_logement_intro",
-                "customCss": "fr-btn--icon-left fr-icon-check-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-left fr-icon-check-line"
               },
               {
                 "type": "SignalementFormLink",
@@ -58,8 +57,7 @@
                 "label": "C'est parti",
                 "slug": "adresse_logement_intro_go",
                 "action": "goto:adresse_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormLink",
@@ -152,8 +150,7 @@
                 "label": "Suivant",
                 "slug": "adresse_logement_next",
                 "action": "goto.checkloc:signalement_concerne",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
-                "validOnEnter": true
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
               },
               {
                 "type": "SignalementFormButton",
@@ -342,8 +339,7 @@
                 "action": "goto.save:vos_coordonnees_occupant",
                 "conditional": {
                   "show": "formStore.data.signalement_concerne_profil === 'logement_occupez'"
-                },
-                "validOnEnter": true
+                }
               },
               {
                 "type": "SignalementFormButton",
@@ -353,8 +349,7 @@
                 "action": "goto.save:vos_coordonnees_tiers",
                 "conditional": {
                   "show": "formStore.data.signalement_concerne_profil === 'autre_logement'"
-                },
-                "validOnEnter": true
+                }
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue
index f14170fd2..1bd999637 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue
@@ -85,8 +85,7 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     const updatedSubscreenData = subscreenManager.generateSubscreenData(this.id, subscreenData.body, this.validate)
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue
index bc707ca24..d7a593dd4 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue
@@ -62,8 +62,7 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     clickEvent: Function,
-    handleClickComponent: Function,
-    validOnEnter: { type: Boolean, default: false }
+    handleClickComponent: Function
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue
index 48f7b6e6e..c1adaebee 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="signalement-form-button" :id="id" ref="button">
+    <div class="signalement-form-button" :id="id" :ref="id">
       <button
         :id="id + '_button'"
-        :ref="id + '_ref'"
+        :ref="idRef"
         :type="type"
         :class="[ 'fr-btn', customCss, formStore.lastButtonClicked === id ? 'fr-btn--loading fr-btn--icon-right fr-icon-refresh-line' : '' ]"
         :disabled="formStore.lastButtonClicked !== ''"
@@ -41,7 +41,6 @@ export default defineComponent({
     ariaControls: { type: String, default: undefined },
     clickEvent: Function,
     access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false },
     // les propriétés suivantes ne sont pas utilisées,
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
@@ -52,23 +51,18 @@ export default defineComponent({
   },
   data () {
     return {
-      formStore
+      formStore,
+      idRef: this.id + '_ref'
     }
   },
   mounted () {
-    const element = this.$refs.button as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (element && !element.classList.contains('fr-hidden')) {
       if (this.access_focus) {
         this.focusInput()
       }
-      if (this.validOnEnter) {
-        window.addEventListener('keyup', this.handleGlobalEnter)
-      }
     }
   },
-  beforeUnmount () {
-    window.removeEventListener('keyup', this.handleGlobalEnter)
-  },
   computed: {
     actionType (): string {
       if (this.action.includes(':')) {
@@ -84,21 +78,17 @@ export default defineComponent({
     }
   },
   methods: {
-    handleClick () {
+    handleClick (event: any) {
       if (this.clickEvent !== undefined) {
+        event.preventDefault()
         this.clickEvent(this.actionType, this.actionParam, this.id)
       }
     },
     focusInput () {
-      const focusableElement = this.$refs[this.id + '_ref'] as HTMLElement
+      const focusableElement = this.$refs[this.idRef] as HTMLElement
       if (focusableElement) {
         focusableElement.focus()
       }
-    },
-    handleGlobalEnter (event: KeyboardEvent) {
-      if (event.key === 'Enter') {
-        this.handleClick()
-      }
     }
   }
 })
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue
index 718253ca8..c9b6992b0 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="fr-fieldset__element signalement-form-checkbox" ref="checkbox">
+  <div class="fr-fieldset__element signalement-form-checkbox" :ref="id">
     <div :class="['fr-checkbox-group', { 'fr-checkbox-group--error': hasError }]" :id="id">
       <input
           type="checkbox"
           :id="idCheckbox"
-          :ref="id + '_ref'"
+          :ref="idRef"
           :name="idCheckbox"
           :value="modelValue"
           :class="[ customCss ]"
@@ -49,18 +49,18 @@ export default defineComponent({
     clickEvent: Function,
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
-    access_autocomplete: { type: String, default: '' },
-    validOnEnter: { type: Boolean, default: false }
+    access_autocomplete: { type: String, default: '' }
   },
   data () {
     return {
       formStore,
       variablesReplacer,
-      idCheckbox: this.id + '_check'
+      idCheckbox: this.id + '_check',
+      idRef: this.id + '_ref'
     }
   },
   mounted () {
-    const element = this.$refs.checkbox as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
@@ -78,7 +78,7 @@ export default defineComponent({
       }
     },
     focusInput () {
-      const focusableElement = (this.$refs[this.id + '_ref']) as HTMLElement
+      const focusableElement = (this.$refs[this.idRef]) as HTMLElement
       if (focusableElement) {
         focusableElement.focus()
       }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue
index c8187b385..afcf2f3cc 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue
@@ -30,8 +30,7 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   }
 })
 </script>
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue
index 691a0fe97..21d334351 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="fr-input-group" :id="id" ref="counter">
+  <div class="fr-input-group" :id="id" :ref="id">
     <label :class="[ customCss, 'fr-label' ]" :for="id + '_input'">
       {{ variablesReplacer.replace(label) }}
       <span class="fr-hint-text">{{ description }}</span>
@@ -9,7 +9,7 @@
         pattern="[0-9]*"
         inputmode="numeric"
         :id="id + '_input'"
-        :ref="id + '_ref'"
+        :ref="idRef"
         :name="id"
         :value="internalValue"
         :class="[ customCss, 'fr-input' ]"
@@ -49,12 +49,12 @@ export default defineComponent({
     handleClickComponent: Function,
     clickEvent: Function,
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined },
-    validOnEnter: { type: Boolean, default: false }
+    access_autocomplete: { type: String, default: undefined }
   },
   data () {
     return {
-      variablesReplacer
+      variablesReplacer,
+      idRef: this.id + '_ref'
     }
   },
   computed: {
@@ -73,7 +73,7 @@ export default defineComponent({
       this.$emit('update:modelValue', value)
     },
     focusInput () {
-      const focusableElement = (this.$refs[this.id + '_ref']) as HTMLElement
+      const focusableElement = (this.$refs[this.idRef]) as HTMLElement
       if (focusableElement) {
         focusableElement.focus()
       }
@@ -84,7 +84,7 @@ export default defineComponent({
     if (this.modelValue === null) {
       this.$emit('update:modelValue', this.internalValue)
     }
-    const element = this.$refs.counter as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue
index 519a8b461..3e677c646 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="fr-input-group" :id="id" ref="date">
+  <div class="fr-input-group" :id="id" :ref="id">
     <label :class="[ customCss, 'fr-label' ]" :for="id + '_input'">{{ label }}</label>
     <span v-if="hint !== ''" class="fr-hint-text">{{ hint }}</span>
     <input
       type="date"
       :id="id + '_input'"
-      :ref="id + '_ref'"
+      :ref="idRef"
       :name="id"
       :value="internalValue"
       :class="[ customCss, 'fr-input' ]"
@@ -43,11 +43,15 @@ export default defineComponent({
     handleClickComponent: Function,
     clickEvent: Function,
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined },
-    validOnEnter: { type: Boolean, default: false }
+    access_autocomplete: { type: String, default: undefined }
+  },
+  data () {
+    return {
+      idRef: this.id + '_ref'
+    }
   },
   mounted () {
-    const element = this.$refs.date as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
@@ -68,7 +72,7 @@ export default defineComponent({
       this.$emit('update:modelValue', value)
     },
     focusInput () {
-      const focusableElement = (this.$refs[this.id + '_ref']) as HTMLElement
+      const focusableElement = (this.$refs[this.idRef]) as HTMLElement
       if (focusableElement) {
         focusableElement.focus()
       }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue
index fcc2a04a4..8f38c1f9f 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue
@@ -2,12 +2,12 @@
   <div
     :class="['signalement-form-disorder-category-item fr-container--fluid fr-p-3v', isSelected || isAlreadySelected ? categoryZoneCss : '']"
     @click="handleClick"
-    ref="disordercategoryitem"
+    :ref="id"
     >
       <input
       type="checkbox"
       :id="id + '_input'"
-      :ref="id + '_ref'"
+      :ref="idRef"
       :name="id"
       v-model="isSelected"
       @change="handleChange"
@@ -36,17 +36,17 @@ export default defineComponent({
     iconSrc: { type: String, default: '' },
     modelValue: { type: Boolean, default: false },
     clickEvent: Function,
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     return {
       isSelected: this.modelValue,
-      formStore
+      formStore,
+      idRef: this.id + '_ref'
     }
   },
   mounted () {
-    const element = this.$refs.disordercategoryitem as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
@@ -80,7 +80,7 @@ export default defineComponent({
       this.$emit('update:modelValue', this.isSelected)
     },
     focusInput () {
-      const focusableElement = this.$refs[this.id + '_ref'] as HTMLElement
+      const focusableElement = this.$refs[this.idRef] as HTMLElement
       if (focusableElement) {
         focusableElement.focus()
       }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue
index 6fa7b92f0..0ceb0adaf 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue
@@ -41,8 +41,7 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue
index af3732146..f6a39a555 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :id="id" class="signalement-form-disorder-overview fr-container--fluid fr-my-3v" ref="disorderoverview">
+  <div :id="id" class="signalement-form-disorder-overview fr-container--fluid fr-my-3v" :ref="id">
     <div v-if="formStore.data.categorieDisorders.batiment.length > 0">
       <div class="fr-grid-row fr-grid-row--gutters fr-grid-row--middle">
         <div class="fr-col-2 fr-col-md-1"><img :src="icons ? icons[0].src : ''" :alt="icons ? icons[0].alt : ''" class="fr-disorder-overview-image"></div>
@@ -20,7 +20,7 @@
                 class="fr-accordion__btn"
                 aria-expanded="false"
                 :aria-controls="'accordion-disorder-batiment-' + index"
-                :ref="id + '_ref'"
+                :ref="idRef"
                 >
                 {{ dictionaryStore[disorder].default }}
               </button>
@@ -30,7 +30,7 @@
                 class="fr-accordion__btn"
                 aria-expanded="false"
                 :aria-controls="'accordion-disorder-batiment-' + index"
-                :ref="id + '_ref'"
+                :ref="idRef"
                 >
                 {{ dictionaryStore[disorder].default }}
               </button>
@@ -68,7 +68,7 @@
                 class="fr-accordion__btn"
                 aria-expanded="false"
                 :aria-controls="'accordion-disorder-logement-' + index"
-                :ref="id + '_ref'"
+                :ref="idRef"
                 >
                 {{ dictionaryStore[disorder].default }}
               </button>
@@ -78,7 +78,7 @@
                 class="fr-accordion__btn"
                 aria-expanded="false"
                 :aria-controls="'accordion-disorder-logement-' + index"
-                :ref="id + '_ref'"
+                :ref="idRef"
                 >
                 {{ dictionaryStore[disorder].default }}
               </button>
@@ -143,18 +143,18 @@ export default defineComponent({
     clickEvent: Function,
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
-    access_autocomplete: { type: String, default: '' },
-    validOnEnter: { type: Boolean, default: false }
+    access_autocomplete: { type: String, default: '' }
   },
   data () {
     return {
       formStore,
       dictionaryStore,
-      idMessageAdministration: 'message_administration'
+      idMessageAdministration: 'message_administration',
+      idRef: this.id + '_ref'
     }
   },
   mounted () {
-    const element = this.$refs.disorderoverview as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
@@ -253,7 +253,7 @@ export default defineComponent({
       this.formStore.data[this.idMessageAdministration] = value
     },
     focusInput () {
-      const focusableElement = (this.$refs[this.id + '_ref']) as Array<HTMLElement>
+      const focusableElement = (this.$refs[this.idRef]) as Array<HTMLElement>
       if (focusableElement[0]) {
         focusableElement[0].focus()
       }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue
index 5f9401740..764007024 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue
@@ -8,6 +8,7 @@
       <input
         type="email"
         :id="id + '_input'"
+        :ref="idRef"
         :name="access_name"
         :autocomplete="access_autocomplete"
         :value="internalValue"
@@ -49,8 +50,12 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     clickEvent: Function,
-    handleClickComponent: Function,
-    validOnEnter: { type: Boolean, default: false }
+    handleClickComponent: Function
+  },
+  data () {
+    return {
+      idRef: this.id + '_ref'
+    }
   },
   computed: {
     internalValue: {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue
index 880b88d03..725b97213 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue
@@ -26,8 +26,7 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue
index 6b71a2e6f..17d1e4807 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="signalement-form-link" ref="link">
+  <div class="signalement-form-link" :ref="id">
     <a
       :id="id"
-      :ref="id + '_ref'"
+      :ref="idRef"
       :class="[ customCss ]"
       :href="variablesReplacer.replace(link)"
       :target="linktarget"
@@ -37,16 +37,16 @@ export default defineComponent({
     // et ça soulève des erreurs W3C
     hasError: { type: Boolean, default: undefined },
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined },
-    validOnEnter: { type: Boolean, default: false }
+    access_autocomplete: { type: String, default: undefined }
   },
   data () {
     return {
-      variablesReplacer
+      variablesReplacer,
+      idRef: this.id + '_ref'
     }
   },
   mounted () {
-    const element = this.$refs.link as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
@@ -58,7 +58,7 @@ export default defineComponent({
       }
     },
     focusInput () {
-      const focusableElement = (this.$refs[this.id + '_ref']) as HTMLElement
+      const focusableElement = (this.$refs[this.idRef]) as HTMLElement
       if (focusableElement) {
         focusableElement.focus()
       }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue
index bfad1e951..81f944932 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue
@@ -49,8 +49,7 @@ export default defineComponent({
     hasError: { type: Boolean, default: undefined },
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   methods: {
     closeModal () {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue
index e5ad45d59..c0baf26a8 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue
@@ -3,7 +3,7 @@
     :id="id"
     :class="[customCss, 'signalement-form-only-choice fr-fieldset']"
     :aria-labelledby="id + '-radio-hint-legend'"
-    ref="onlychoice"
+    :ref="id"
     >
       <legend
         :class="['fr-fieldset__legend--regular', 'fr-fieldset__legend', customLegendCss]"
@@ -62,16 +62,16 @@ export default defineComponent({
     clickEvent: Function,
     handleClickComponent: Function,
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined },
-    validOnEnter: { type: Boolean, default: false }
+    access_autocomplete: { type: String, default: undefined }
   },
   data () {
     return {
-      variablesReplacer
+      variablesReplacer,
+      idRef: this.id + '_ref'
     }
   },
   mounted () {
-    const element = this.$refs.onlychoice as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue
index fef0f5196..4b6498138 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue
@@ -209,8 +209,7 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue
index 435c3761e..3a78e67c3 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue
@@ -33,6 +33,28 @@
             class="fr-input"
             :aria-describedby="formStore.validationErrors[id] !== undefined ? id + '-text-input-error-desc-error' : undefined"
             >
+            <option
+              v-for="countryItem in countryList"
+              v-bind:key="countryItem.code"
+              :value="countryItem.code"
+              >
+              {{ countryItem.label }}
+            </option>
+          </select>
+        </div>
+        <div class="fr-col-12 fr-col-md-8">
+          <div class="fr-input-wrap fr-icon-phone-line">
+            <input
+              type="text"
+              :id="id"
+              :ref="idRef"
+              :name="access_name"
+              :autocomplete="access_autocomplete"
+              v-model="formStore.data[id]"
+              class="fr-input"
+              :aria-describedby="formStore.validationErrors[id] !== undefined ? id + '-text-input-error-desc-error' : undefined"
+              >
+          </div>
         </div>
       </div>
       <div
@@ -131,8 +153,7 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     modelValue: { type: String, default: null },
-    handleClickComponent: Function,
-    validOnEnter: { type: Boolean, default: false }
+    handleClickComponent: Function
   },
   data () {
     if (formStore.data[this.id + '_countrycode'] === '' || formStore.data[this.id + '_countrycode'] === undefined) {
@@ -149,7 +170,8 @@ export default defineComponent({
       idCountryCodeSecond: this.id + '_secondaire_countrycode',
       idShow: this.id + '_ajouter_numero',
       actionShow: 'show:' + this.id + '_secondaire_group',
-      formStore
+      formStore,
+      idRef: this.id + '_ref'
     }
   },
   methods: {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue
index 3d2e0c306..73beec74c 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue
@@ -71,8 +71,7 @@ export default defineComponent({
     // et ça soulève des erreurs W3C
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
-    access_autocomplete: { type: String, default: '' },
-    validOnEnter: { type: Boolean, default: false }
+    access_autocomplete: { type: String, default: '' }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormScreen.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormScreen.vue
index 38cef6786..f5903bf8f 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormScreen.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormScreen.vue
@@ -46,8 +46,7 @@
         :access_name="component.accessibility?.name ?? component.slug"
         :access_autocomplete="component.accessibility?.autocomplete ?? 'off'"
         :access_focus="component.accessibility?.focus ?? false"
-        :validOnEnter="component.validOnEnter ?? false"
-      />
+        />
     </div>
   </div>
   <div
@@ -83,7 +82,6 @@
         :clickEvent="handleClickComponent"
         :handleClickComponent="handleClickComponent"
         :access_focus="component.accessibility?.focus ?? false"
-        :validOnEnter="component.validOnEnter ?? false"
       />
     </div>
   </div>
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue
index f40e78c84..5ee492c86 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue
@@ -13,7 +13,6 @@
         :access_name="component.accessibility?.name ?? component.slug"
         :access_autocomplete="component.accessibility?.autocomplete ?? 'off'"
         :access_focus="component.accessibility?.focus ?? false"
-        :validOnEnter="component.validOnEnter ?? false"
         :label="component.label"
         :hint="component.hint"
         :labelInfo="component.labelInfo"
@@ -104,8 +103,7 @@ export default defineComponent({
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
     access_focus: { type: Boolean, default: false },
-    clickEvent: Function,
-    validOnEnter: { type: Boolean, default: false }
+    clickEvent: Function
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue
index 67d23207c..c06d67ad0 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue
@@ -50,8 +50,7 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   computed: {
     internalValue: {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue
index 53f933e85..a6dad2dde 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue
@@ -1,5 +1,5 @@
 <template>
-<div :class="['fr-input-group', { 'fr-input-group--disabled': disabled }]" :id="id" ref="textfield">
+<div :class="['fr-input-group', { 'fr-input-group--disabled': disabled }]" :id="id" :ref="id">
   <label class='fr-label' :for="id + '_input'">
     {{ variablesReplacer.replace(label) }}
     <span class="fr-hint-text">{{ description }}</span>
@@ -8,7 +8,7 @@
       <input
         type="text"
         :id="id + '_input'"
-        :ref="id + '_ref'"
+        :ref="idRef"
         :name="access_name"
         :autocomplete="access_autocomplete"
         :value="internalValue"
@@ -56,17 +56,17 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     clickEvent: Function,
-    handleClickComponent: Function,
-    validOnEnter: { type: Boolean, default: false }
+    handleClickComponent: Function
   },
   data () {
     return {
       idFetchTimeout: 0 as unknown as ReturnType<typeof setTimeout>,
-      variablesReplacer
+      variablesReplacer,
+      idRef: this.id + '_ref'
     }
   },
   mounted () {
-    const element = this.$refs.textfield as HTMLElement
+    const element = this.$refs[this.id] as HTMLElement
     if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
       this.focusInput()
     }
@@ -90,7 +90,7 @@ export default defineComponent({
       }
     },
     focusInput () {
-      const focusableElement = (this.$refs[this.id + '_ref']) as HTMLElement
+      const focusableElement = (this.$refs[this.idRef]) as HTMLElement
       if (focusableElement) {
         focusableElement.focus()
       }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue
index c8dee9306..e6d463ee1 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue
@@ -85,8 +85,7 @@ export default defineComponent({
     clickEvent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue
index e0b62f800..919c9863c 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue
@@ -46,8 +46,7 @@ export default defineComponent({
     clickEvent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue
index 1edd25a1f..b31f40300 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue
@@ -26,8 +26,7 @@ export default defineComponent({
     clickEvent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false },
-    validOnEnter: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false }
   },
   data () {
     return {