diff --git a/.eslintrc.js b/.eslintrc.js
index ee02035f..ad3b53ed 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,4 +7,7 @@ module.exports = {
     "plugin:@typescript-eslint/recommended",
     "plugin:jsx-a11y/recommended",
   ],
+  rules: {
+    "@typescript-eslint/ban-ts-comment": "warn",
+  },
 };
diff --git a/src/components/organisms/MyProfileForm/MyProfileForm.tsx b/src/components/organisms/MyProfileForm/MyProfileForm.tsx
index 9594bfad..7366299e 100644
--- a/src/components/organisms/MyProfileForm/MyProfileForm.tsx
+++ b/src/components/organisms/MyProfileForm/MyProfileForm.tsx
@@ -11,6 +11,7 @@ import styled, { withTheme } from "styled-components";
 
 import { Input, Button, Text, Checkbox, TextArea } from "../../../";
 import { ExtendableStyledComponent } from "types/component";
+import useAdditionalFieldTranslations from "../../../hooks/useAdditionalFieldsTranslations";
 
 const StyledFormHeader = styled.div<{ mobile: boolean }>`
   h2,
@@ -106,6 +107,8 @@ export const MyProfileForm: React.FC<Props> = ({
     phone: "",
   });
   const { t } = useTranslation();
+  const { getFieldTranslations, filterByKey } =
+    useAdditionalFieldTranslations();
   const {
     updateProfile,
     fields,
@@ -296,57 +299,73 @@ export const MyProfileForm: React.FC<Props> = ({
                 error={touched.phone && errors.phone}
               />
 
-              {fields &&
-                Array.isArray(fields.list) &&
-                fields.list
-                  .filter(
-                    (field: API.Metadata) =>
-                      field.type === "varchar" || field.type === "text"
-                  )
-                  .map((field: API.Metadata, index: number) =>
-                    field.type === "varchar" ? (
-                      <Input
-                        key={`${field}${index}`}
-                        required={isAdditionalRequiredField(field)}
-                        label={t(`AdditionalFields.${field.name}`)}
-                        type="text"
-                        name={field.name}
-                        onChange={handleChange}
-                        onBlur={handleBlur}
-                        value={String(values[field.name]) || ""}
-                        error={errors[field.name] && touched[field.name]}
-                      />
-                    ) : (
-                      <TextArea
-                        rows={10}
-                        key={`${field}${index}`}
-                        required={isAdditionalRequiredField(field)}
-                        label={t(`AdditionalFields.${field.name}`)}
-                        name={field.name}
-                        onChange={handleChange}
-                        onBlur={handleBlur}
-                        value={String(values[field.name]) || ""}
-                        error={errors[field.name] && touched[field.name]}
-                      />
-                    )
-                  )}
+              {(fields.list || [])
+                .filter((field: API.Metadata) => {
+                  const r = filterByKey(field);
 
-              {fields &&
-                fields.list &&
-                fields.list
-                  .filter((field: API.Metadata) => field.type === "boolean")
-                  .map((field: API.Metadata, index: number) => (
-                    <Checkbox
-                      checked={!!values[field.name]}
-                      key={`${field.id}${index}`}
-                      label={t(`AdditionalFields.${field.name}`)}
-                      id={field.name + Date.now()}
+                  return field.type !== "boolean" && !r;
+                })
+                // NOTE: this is old filtering im not sure we should have diffrent filter for register and edit form this is for consideration
+                // .filter(
+                //   (field: API.Metadata) =>
+                //     field.type === "varchar" || field.type === "text"
+                // )
+                .map((field: API.Metadata, index: number) =>
+                  field.type === "varchar" ? (
+                    <Input
+                      key={`${field}${index}`}
+                      required={isAdditionalRequiredField(field)}
+                      label={
+                        getFieldTranslations(field) ||
+                        t(`AdditionalFields.${field.name}`)
+                      }
+                      type="text"
                       name={field.name}
                       onChange={handleChange}
                       onBlur={handleBlur}
+                      value={String(values[field.name]) || ""}
+                      error={errors[field.name] && touched[field.name]}
+                    />
+                  ) : (
+                    <TextArea
+                      rows={10}
+                      key={`${field}${index}`}
                       required={isAdditionalRequiredField(field)}
+                      label={
+                        getFieldTranslations(field) ||
+                        t(`AdditionalFields.${field.name}`)
+                      }
+                      name={field.name}
+                      onChange={handleChange}
+                      onBlur={handleBlur}
+                      value={String(values[field.name]) || ""}
+                      error={errors[field.name] && touched[field.name]}
                     />
-                  ))}
+                  )
+                )}
+
+              {(fields.list || [])
+                // .filter((field: API.Metadata) => field.type === "boolean")
+                .filter((field: API.Metadata) => {
+                  const r = filterByKey(field);
+
+                  return field.type === "boolean" && !r;
+                })
+                .map((field: API.Metadata, index: number) => (
+                  <Checkbox
+                    checked={!!values[field.name]}
+                    key={`${field.id}${index}`}
+                    label={
+                      getFieldTranslations(field) ||
+                      t(`AdditionalFields.${field.name}`)
+                    }
+                    id={field.name + Date.now()}
+                    name={field.name}
+                    onChange={handleChange}
+                    onBlur={handleBlur}
+                    required={isAdditionalRequiredField(field)}
+                  />
+                ))}
 
               <Button
                 mode="secondary"
diff --git a/src/components/organisms/RegisterForm/RegisterForm.tsx b/src/components/organisms/RegisterForm/RegisterForm.tsx
index c55a1b2c..ee7bc414 100644
--- a/src/components/organisms/RegisterForm/RegisterForm.tsx
+++ b/src/components/organisms/RegisterForm/RegisterForm.tsx
@@ -18,6 +18,7 @@ import { Input, Button, Title, Link, Text, Checkbox } from "../../../";
 import { getStylesBasedOnTheme } from "../../../utils/utils";
 import { ExtendableStyledComponent } from "types/component";
 import { API } from "@escolalms/sdk/lib";
+import useAdditionalFieldTranslations from "../../../hooks/useAdditionalFieldsTranslations";
 
 const StyledDiv = styled.div<{ mobile: boolean }>`
   margin: 0;
@@ -126,7 +127,8 @@ export const RegisterForm: React.FC<RegisterFormProps> = ({
   });
   const { t } = useTranslation();
   const { register, fields, fetchFields } = useContext(EscolaLMSContext);
-
+  const { getFieldTranslations, filterByKey } =
+    useAdditionalFieldTranslations();
   useEffect(() => {
     fetchFields({ class_type: "App\\Models\\User" });
   }, []);
@@ -321,53 +323,50 @@ export const RegisterForm: React.FC<RegisterFormProps> = ({
               error={touched.phone && errors.phone}
             />
 
-            {fields &&
-              Array.isArray(fields.list) &&
-              fields.list
-                .filter((field: API.Metadata) => {
-                  const r =
-                    Array.isArray(field.extra) &&
-                    field.extra?.filter(
-                      (item: Record<string, string | number | boolean>) =>
-                        item.register
-                    );
+            {(fields.list || [])
+              .filter((field: API.Metadata) => {
+                const r = filterByKey(field);
+
+                return field.type !== "boolean" && !r;
+              })
+              .map((field: API.Metadata, index: number) => (
+                <Input
+                  key={`${field}${index}`}
+                  required={isAdditionalRequiredField(field)}
+                  label={
+                    getFieldTranslations(field) ||
+                    fieldLabels[`AdditionalFields.${field.name}`] ||
+                    t(`AdditionalFields.${field.name}`)
+                  }
+                  type="text"
+                  name={field.name}
+                  onChange={handleChange}
+                  onBlur={handleBlur}
+                  value={String(values[field.name]) || ""}
+                  error={errors[field.name] && touched[field.name]}
+                />
+              ))}
 
-                  return field.type !== "boolean" && !r;
-                })
-                .map((field: API.Metadata, index: number) => (
-                  <Input
-                    key={`${field}${index}`}
-                    required={isAdditionalRequiredField(field)}
-                    label={
-                      fieldLabels[`AdditionalFields.${field.name}`] ||
-                      t(`AdditionalFields.${field.name}`)
-                    }
-                    type="text"
-                    name={field.name}
-                    onChange={handleChange}
-                    onBlur={handleBlur}
-                    value={String(values[field.name]) || ""}
-                    error={errors[field.name] && touched[field.name]}
-                  />
-                ))}
+            {(fields.list || [])
+              .filter((field: API.Metadata) => {
+                const r = filterByKey(field);
 
-            {fields &&
-              fields.list &&
-              fields.list
-                .filter((field: API.Metadata) => field.type === "boolean")
-                .map((field: API.Metadata, index: number) => (
-                  <Checkbox
-                    key={`${field.id}${index}`}
-                    label={
-                      fieldLabels[`AdditionalFields.${field.name}`] ||
-                      t(`AdditionalFields.${field.name}`)
-                    }
-                    id={field.name + Date.now()}
-                    name={field.name}
-                    onChange={handleChange}
-                    onBlur={handleBlur}
-                  />
-                ))}
+                return field.type === "boolean" && !r;
+              })
+              .map((field: API.Metadata, index: number) => (
+                <Checkbox
+                  key={`${field.id}${index}`}
+                  label={
+                    getFieldTranslations(field) ||
+                    fieldLabels[`AdditionalFields.${field.name}`] ||
+                    t(`AdditionalFields.${field.name}`)
+                  }
+                  id={field.name + Date.now()}
+                  name={field.name}
+                  onChange={handleChange}
+                  onBlur={handleBlur}
+                />
+              ))}
 
             <Button mode="primary" type="submit" loading={isSubmitting} block>
               {t<string>("Login.Signup")}
diff --git a/src/hooks/useAdditionalFieldsTranslations.tsx b/src/hooks/useAdditionalFieldsTranslations.tsx
new file mode 100644
index 00000000..f6d9f59b
--- /dev/null
+++ b/src/hooks/useAdditionalFieldsTranslations.tsx
@@ -0,0 +1,41 @@
+import { API } from "@escolalms/sdk/lib";
+import { useCallback } from "react";
+import { useTranslation } from "react-i18next"; // assuming you are using react-i18next for translations
+
+const useAdditionalField = () => {
+  const { i18n } = useTranslation();
+
+  const additionalFieldTranslations = useCallback(
+    (fieldMeta: API.Metadata) => {
+      //@ts-ignore
+      const translations = fieldMeta?.extra?.[0]?.translations;
+      if (translations && typeof translations === "object") {
+        return translations[i18n.language];
+      } else {
+        return false;
+      }
+    },
+    [i18n.language]
+  );
+
+  const filter = useCallback(
+    (fieldMeta: API.Metadata, keyName = "register") => {
+      return (
+        Array.isArray(fieldMeta.extra) &&
+        fieldMeta.extra.filter(
+          (item: Record<string, string | number | boolean> | null) => {
+            return item && item[keyName];
+          }
+        )
+      );
+    },
+    []
+  );
+
+  return {
+    getFieldTranslations: additionalFieldTranslations,
+    filterByKey: filter,
+  };
+};
+
+export default useAdditionalField;