diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 7ac451774..165e133a2 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -1183,7 +1183,17 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                   {fields.map((field, index) => (
                     <Form.Item key={field.key}>
                       <LayoutFormRow noDivider>
-                        <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
+                        <Form.Item
+                          label={t("general.labels.label")}
+                          key={`${index}label`}
+                          name={[field.name, "label"]}
+                          rules={[
+                            {
+                              required: true
+                              //message: t("general.validation.required"),
+                            }
+                          ]}
+                        >
                           <Input />
                         </Form.Item>
                         <Form.Item
@@ -1294,7 +1304,17 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                 {fields.map((field, index) => (
                   <Form.Item key={field.key}>
                     <LayoutFormRow noDivider>
-                      <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
+                      <Form.Item
+                        label={t("general.labels.label")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
                         <Input />
                       </Form.Item>
                       <Form.Item
@@ -1483,15 +1503,31 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                 {fields.map((field, index) => (
                   <Form.Item key={field.key}>
                     <LayoutFormRow noDivider>
-                      <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
+                      <Form.Item
+                        label={t("general.labels.label")}
+                        key={`${index}label`}
+                        name={[field.name, "label"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
                         <Input />
                       </Form.Item>
                       <Form.Item
                         label={t("bodyshop.labels.md_to_emails_emails")}
                         key={`${index}emails`}
                         name={[field.name, "emails"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
                       >
-                        <Select mode="tags" tokenSeparators={[",", ";"]} />
+                        <FormItemEmail email={form.getFieldValue([field.name, "emails"])} />
                       </Form.Item>
 
                       <Space>