diff --git a/web/layouts/beneficiaries/create-diag.html b/web/layouts/beneficiaries/create-diag.html
index 175968a..6ebbf34 100644
--- a/web/layouts/beneficiaries/create-diag.html
+++ b/web/layouts/beneficiaries/create-diag.html
@@ -13,9 +13,9 @@
             ui_schema: null,
         },
         rules: {
-            name: ['required']
-            namespace: ['required']
-            json_schema: ['required']
+            name: ['required'],
+            namespace: ['required'],
+            json_schema: ['required'],
             ui_schema: ['required']
         },
         formValidation: {
@@ -54,7 +54,7 @@
                     <div class="grid grid-cols-6 gap-6">
                         <div class="col-span-6 sm:col-span-3">
                             <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="name" id="name" autocomplete="given-name"
+                            <input type="text" name="name" id="name" autocomplete="name"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 x-model="fields.name" @blur="validateField('name')"
                                 :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
diff --git a/web/layouts/diags/update-diag.html b/web/layouts/diags/update-diag.html
index 7c02b72..cb0da04 100644
--- a/web/layouts/diags/update-diag.html
+++ b/web/layouts/diags/update-diag.html
@@ -13,9 +13,9 @@
             ui_schema: '{{.ViewState.diag.Ui_schema}}',
         },
         rules: {
-            name: ['required']
-            namespace: ['required']
-            json_schema: ['required']
+            name: ['required'],
+            namespace: ['required'],
+            json_schema: ['required'],
             ui_schema: ['required']
         },
         formValidation: {
diff --git a/web/layouts/vehicles/create-booking-diag.html b/web/layouts/vehicles/create-booking-diag.html
index bbe3220..15382f7 100644
--- a/web/layouts/vehicles/create-booking-diag.html
+++ b/web/layouts/vehicles/create-booking-diag.html
@@ -13,9 +13,9 @@
             ui_schema: null,
         },
         rules: {
-            name: ['required']
-            namespace: ['required']
-            json_schema: ['required']
+            name: ['required'],
+            namespace: ['required'],
+            json_schema: ['required'],
             ui_schema: ['required']
         },
         formValidation: {
diff --git a/web/layouts/vehicles_management/create-vehicle-diag.html b/web/layouts/vehicles_management/create-vehicle-diag.html
index 0f335c1..a11cca3 100644
--- a/web/layouts/vehicles_management/create-vehicle-diag.html
+++ b/web/layouts/vehicles_management/create-vehicle-diag.html
@@ -13,9 +13,9 @@
             ui_schema: null,
         },
         rules: {
-            name: ['required']
-            namespace: ['required']
-            json_schema: ['required']
+            name: ['required'],
+            namespace: ['required'],
+            json_schema: ['required'],
             ui_schema: ['required']
         },
         formValidation: {