diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index f0f1d96..5394820 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -152,7 +152,8 @@
   "AdminSetting": {
     "id": "کد یکتا",
     "edit": "ویرایش",
-    "name": "نام",
+    "name": "نام انگلیسی",
+    "name_fa": "نام فارسی",
     "value": "مقدار"
   },
   "UpdateProfile": {
@@ -489,12 +490,14 @@
     "button-cancel": "بستن",
     "refahi": "رفاهی",
     "navgan": "ناوگان",
-    "setting_name": "نام",
+    "setting_name": "نام انگلیسی",
+    "setting_name_fa": "نام فارسی",
     "value": "مقدار",
     "phone_number": "شماره تلفن",
     "national_id": "کد ملی",
     "name_string": "نام می بایست متن باشد",
-    "setting_name_error": "وارد کردن نام الزامیست",
+    "setting_name_error": "وارد کردن نام انگلیسی الزامیست",
+    "setting_name_fa_error": "وارد کردن نام فارسی الزامیست",
     "value_error": "وارد کردن مقدار الزامیست",
     "value_string": "مقدار می بایست متن باشد",
     "name": "نام انگلیسی",
@@ -590,7 +593,8 @@
   },
   "AddDialog": {
     "add": "افزودن",
-    "setting_name": "نام",
+    "setting_name": "نام انگلیسی",
+    "setting_name_fa": "نام فارسی",
     "value": "مقدار",
     "name": "نام انگلیسی",
     "name_error": "وارد کردن نام انگلیسی الزامیست",
@@ -611,7 +615,8 @@
     "type_id_error": "وارد کردن نوع کاربر الزامیست",
     "navgan_id_error": "وارد کردن کد ناوگان الزامیست",
     "name_string": "نام می بایست متن باشد",
-    "setting_name_error": "وارد کردن نام الزامیست",
+    "setting_name_error": "وارد کردن نام انگلیسی الزامیست",
+    "setting_name_fa_error": "وارد کردن نام فارسی الزامیست",
     "value_error": "وارد کردن مقدار الزامیست",
     "value_string": "مقدار می بایست متن باشد",
     "refahi": "رفاهی",
diff --git a/src/components/dashboard/admin-setting/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/admin-setting/Form/CreateForm/CreateContent.jsx
index dc19c2e..f10a97b 100644
--- a/src/components/dashboard/admin-setting/Form/CreateForm/CreateContent.jsx
+++ b/src/components/dashboard/admin-setting/Form/CreateForm/CreateContent.jsx
@@ -11,6 +11,8 @@ const CreateContent = ({mutate, setOpenConfirmDialog}) => {
     const validationSchema = Yup.object().shape({
         name: Yup.string("AddDialog.name_string")
             .required(t("AddDialog.setting_name_error")),
+        name_fa: Yup.string("AddDialog.name_fa_string")
+            .required(t("AddDialog.setting_name_fa_error")),
         value: Yup.string("AddDialog.value_string")
             .required(t("AddDialog.value_error")),
     });
@@ -18,10 +20,12 @@ const CreateContent = ({mutate, setOpenConfirmDialog}) => {
     const formik = useFormik({
         initialValues: {
             name: "",
+            name_fa: "",
             value: "",
         }, validationSchema, onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("name", values.name);
+            formData.append("name_fa", values.name_fa);
             formData.append("value", values.value);
 
             requestServer(ADD_ADMIN_SETTING, 'post', {
@@ -41,6 +45,21 @@ const CreateContent = ({mutate, setOpenConfirmDialog}) => {
         <>
             <DialogContent>
                 <Stack spacing={2}>
+                    <Stack>
+                        <TextField
+                            name="name_fa"
+                            rows={8}
+                            label={t("AddDialog.setting_name_fa")}
+                            value={formik.values.name_fa}
+                            onChange={formik.handleChange}
+                            fullWidth
+                            variant="outlined"
+                            onBlur={formik.handleBlur("name_fa")}
+                            error={formik.touched.name_fa && Boolean(formik.errors.name_fa)}
+                            helperText={formik.touched.name_fa && formik.errors.name_fa}
+                            sx={{mt: 1}}
+                        />
+                    </Stack>
                     <Stack>
                         <TextField
                             name="name"
diff --git a/src/components/dashboard/admin-setting/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/admin-setting/Form/UpdateForm/UpdateContent.jsx
index ae28fb6..f521ced 100644
--- a/src/components/dashboard/admin-setting/Form/UpdateForm/UpdateContent.jsx
+++ b/src/components/dashboard/admin-setting/Form/UpdateForm/UpdateContent.jsx
@@ -12,19 +12,23 @@ const UpdateContent = ({row, mutate, setOpenConfirmDialog}) => {
     const {update_notification} = useNotification()
 
     const validationSchema = Yup.object().shape({
-        name: Yup.string("AddDialog.name_string")
-            .required(t("AddDialog.setting_name_error")),
-        value: Yup.string("AddDialog.value_string")
-            .required(t("AddDialog.value_error")),
+        name: Yup.string("UpdateDialog.name_string")
+            .required(t("UpdateDialog.setting_name_error")),
+        name_fa: Yup.string("UpdateDialog.name_fa_string")
+            .required(t("UpdateDialog.setting_name_fa_error")),
+        value: Yup.string("UpdateDialog.value_string")
+            .required(t("UpdateDialog.value_error")),
     });
 
     const formik = useFormik({
         initialValues: {
             name: row.getValue("name"),
+            name_fa: row.getValue("name_fa"),
             value: row.getValue("value"),
         }, validationSchema, onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("name", values.name);
+            formData.append("name_fa", values.name_fa);
             formData.append("value", values.value);
             requestServer(`${UPDATE_ADMIN_SETTING}/${row.getValue("id")}`, 'post', {
                 data: formData,
@@ -42,6 +46,21 @@ const UpdateContent = ({row, mutate, setOpenConfirmDialog}) => {
         <>
             <DialogContent>
                 <Stack spacing={2}>
+                    <Stack>
+                        <TextField
+                            name="name_fa"
+                            rows={8}
+                            label={t("UpdateDialog.setting_name_fa")}
+                            value={formik.values.name_fa}
+                            onChange={formik.handleChange}
+                            fullWidth
+                            variant="outlined"
+                            onBlur={formik.handleBlur("name_fa")}
+                            error={formik.touched.name_fa && Boolean(formik.errors.name_fa)}
+                            helperText={formik.touched.name_fa && formik.errors.name_fa}
+                            sx={{mt: 1}}
+                        />
+                    </Stack>
                     <Stack>
                         <TextField
                             name="name"
diff --git a/src/components/dashboard/admin-setting/index.jsx b/src/components/dashboard/admin-setting/index.jsx
index 6490595..685c47a 100644
--- a/src/components/dashboard/admin-setting/index.jsx
+++ b/src/components/dashboard/admin-setting/index.jsx
@@ -22,6 +22,18 @@ function DashboardAdminSettingComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.name_fa,
+                id: "name_fa",
+                header: t("AdminSetting.name_fa"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.name,
                 id: "name",
@@ -40,7 +52,7 @@ function DashboardAdminSettingComponent() {
                 header: t("AdminSetting.value"),
                 enableColumnFilter: true,
                 datatype: "text",
-                filterFn: "equals",
+                filterFn: "contains",
                 columnFilterModeOptions: [
                     "equals",
                     "contains",
@@ -62,7 +74,7 @@ function DashboardAdminSettingComponent() {
                 CustomToolbar={TableToolbar}
                 enableLastUpdate={true}
                 sorting={[{
-                    id: 'name', desc: false
+                    id: 'id', desc: false
                 }]}
                 enablePinning={true}
                 enableDensityToggle={false}