diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
index 7815272..7013bac 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js
@@ -73,28 +73,39 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                     }
                 }),
         }),
-        onSubmit: (values) => {
-            HttpUtils.post({
-                url: POST_ORG_USER + "/" + userData.id,
-                params: {
-                    contactTel: {
-                        countryCode: values.tel_countryCode,
-                        phoneNumber: values.phoneNumber
+        onSubmit: (values, { setSubmitting }) => {
+            return new Promise((resolve) => {
+                HttpUtils.post({
+                    url: POST_ORG_USER + "/" + userData.id,
+                    params: {
+                        contactTel: {
+                            countryCode: values.tel_countryCode,
+                            phoneNumber: values.phoneNumber
+                        },
+                        faxNo: {
+                            countryCode: values.fax_countryCode,
+                            faxNumber: values.faxNumber
+                        },
+                        // identification: values.identification,
+                        emailBus: values.emailBus,
+                        contactPerson: values.contactPerson,
+                        orgId: values.orgId?.id,
+                        preferLocale: values.preferLocale?.type
                     },
-                    faxNo: {
-                        countryCode: values.fax_countryCode,
-                        faxNumber: values.faxNumber
+                    onSuccess: function () {
+                        resolve();
+                        notifySaveSuccess();
+                        loadDataFun();
                     },
-                    // identification: values.identification,
-                    emailBus: values.emailBus,
-                    contactPerson: values.contactPerson,
-                    orgId: values.orgId?.id,
-                    preferLocale: values.preferLocale?.type
-                },
-                onSuccess: function () {
-                    notifySaveSuccess()
-                    loadDataFun();
-                }
+                    onFail: function () {
+                        setSubmitting(false);
+                        resolve();
+                    },
+                    onError: function () {
+                        setSubmitting(false);
+                        resolve();
+                    }
+                });
             });
         }
 
@@ -200,6 +211,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                                     variant="contained"
                                                     onClick={onResetBack}
                                                     color="cancel"
+                                                    disabled={formik.isSubmitting}
                                                 >
                                                     Reset & Back
                                                 </Button>
@@ -209,6 +221,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                                                     variant="contained"
                                                     type="submit"
                                                     color="success"
+                                                    disabled={formik.isSubmitting}
                                                 >
                                                     Save
                                                 </Button>
diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js
index 96d1ea3..00f7cd7 100644
--- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js
+++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js
@@ -59,25 +59,35 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => {
             tel_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({id: 'require3Number'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))),
             phoneNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'require8Number'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireContactNumber'}))),
         }),
-        onSubmit: (values) => {
-            // console.log(values);
-            HttpUtils.post({
-                url: UrlUtils.POST_PUB_ORG_USER,
-                params: {
-                    contactTel: {
-                        countryCode: values.tel_countryCode,
-                        phoneNumber: values.phoneNumber
+        onSubmit: (values, { setSubmitting }) => {
+            return new Promise((resolve) => {
+                HttpUtils.post({
+                    url: UrlUtils.POST_PUB_ORG_USER,
+                    params: {
+                        contactTel: {
+                            countryCode: values.tel_countryCode,
+                            phoneNumber: values.phoneNumber
+                        },
+                        faxNo: {
+                            countryCode: values.fax_countryCode,
+                            faxNumber: values.faxNumber
+                        },
+                        preferLocale: values.preferLocale.type
                     },
-                    faxNo: {
-                        countryCode: values.fax_countryCode,
-                        faxNumber: values.faxNumber
+                    onSuccess: function () {
+                        resolve();
+                        notifySaveSuccess();
+                        loadDataFun();
                     },
-                    preferLocale: values.preferLocale.type
-                },
-                onSuccess: function () {
-                    notifySaveSuccess()
-                    loadDataFun();
-                }
+                    onFail: function () {
+                        setSubmitting(false);
+                        resolve();
+                    },
+                    onError: function () {
+                        setSubmitting(false);
+                        resolve();
+                    }
+                });
             });
         }
 
@@ -127,6 +137,7 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => {
                                                 variant="contained"
                                                 onClick={onResetBack}
                                                 color="cancel"
+                                                disabled={formik.isSubmitting}
                                             >
                                                 <FormattedMessage id="resetAndBack" />
 
@@ -137,6 +148,7 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => {
                                                 variant="contained"
                                                 type="submit"
                                                 color="success"
+                                                disabled={formik.isSubmitting}
                                             >
                                                 <FormattedMessage id="save" />