diff --git a/src/components/dashboard/change-password/index.jsx b/src/components/dashboard/change-password/index.jsx
index cd2b9fd..07213e6 100644
--- a/src/components/dashboard/change-password/index.jsx
+++ b/src/components/dashboard/change-password/index.jsx
@@ -133,7 +133,7 @@ const DashboardChangePasswordComponent = () => {
                                             variant="contained"
                                             color="primary"
                                             size="large"
-                                            disabled={props.isSubmitting}
+                                            disabled={props.isSubmitting || !props.dirty || !props.isValid}
                                         >
                                             {props.isSubmitting
                                                 ? t("SubmitButton.button_while_submit")
diff --git a/src/components/dashboard/commercial-chief/Form/RejectForm.jsx b/src/components/dashboard/commercial-chief/Form/RejectForm.jsx
index fd8becb..ec27a31 100644
--- a/src/components/dashboard/commercial-chief/Form/RejectForm.jsx
+++ b/src/components/dashboard/commercial-chief/Form/RejectForm.jsx
@@ -135,7 +135,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/commercial-chief/index.jsx b/src/components/dashboard/commercial-chief/index.jsx
index b04253a..546bd73 100644
--- a/src/components/dashboard/commercial-chief/index.jsx
+++ b/src/components/dashboard/commercial-chief/index.jsx
@@ -124,6 +124,7 @@ function DashboardCommercialChiefComponent() {
         ],
         []
     );
+
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/development-assistant/Form/RejectForm.jsx b/src/components/dashboard/development-assistant/Form/RejectForm.jsx
index eb4e4a1..5b78c6c 100644
--- a/src/components/dashboard/development-assistant/Form/RejectForm.jsx
+++ b/src/components/dashboard/development-assistant/Form/RejectForm.jsx
@@ -135,7 +135,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/development-assistant/index.jsx b/src/components/dashboard/development-assistant/index.jsx
index 0e058dd..2c09de2 100644
--- a/src/components/dashboard/development-assistant/index.jsx
+++ b/src/components/dashboard/development-assistant/index.jsx
@@ -125,6 +125,7 @@ function DashboardDevelopmentAssistantComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx b/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx
index b1c708c..b0a9157 100644
--- a/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx
+++ b/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx
@@ -81,7 +81,7 @@ const ChnagePasswordContent = ({rowId, fetchUrl, mutate, setOpenChangePasswordDi
                     {t("ExpertMangement.button-cancel")}
                 </Button>
                 <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                        disabled={formik.isSubmitting}>
+                        disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                     {t("ExpertMangement.button-confirm")}
                 </Button>
             </DialogActions>
diff --git a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx
index dc9e62f..3757087 100644
--- a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx
+++ b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx
@@ -374,7 +374,7 @@ const CreateContent = ({setOpenCreateDialog, mutate, fetchUrl}) => {
                     {t("ExpertMangement.button-cancel")}
                 </Button>
                 <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                        disabled={formik.isSubmitting}>
+                        disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                     {t("ExpertMangement.button-confirm")}
                 </Button>
             </DialogActions>
diff --git a/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx b/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx
index dc6864c..a53a7c6 100644
--- a/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx
+++ b/src/components/dashboard/expert-management/Form/UpdateForm/UpdateContent.jsx
@@ -332,7 +332,7 @@ const UpdateContent = ({row, fetchUrl, mutate, setOpenUpdateDialog}) => {
                     {t("ExpertMangement.button-cancel")}
                 </Button>
                 <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                        disabled={formik.isSubmitting}>
+                        disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                     {t("ExpertMangement.button-confirm")}
                 </Button>
             </DialogActions>
diff --git a/src/components/dashboard/expert-management/index.jsx b/src/components/dashboard/expert-management/index.jsx
index 2c711c5..a69a550 100644
--- a/src/components/dashboard/expert-management/index.jsx
+++ b/src/components/dashboard/expert-management/index.jsx
@@ -138,6 +138,7 @@ function DashboardExpertManagementComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/inspector-expert/Form/RejectForm.jsx b/src/components/dashboard/inspector-expert/Form/RejectForm.jsx
index f59758d..87f7c47 100644
--- a/src/components/dashboard/inspector-expert/Form/RejectForm.jsx
+++ b/src/components/dashboard/inspector-expert/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx b/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx
index 92e1a1e..b53d8e0 100644
--- a/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx
+++ b/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx
@@ -93,7 +93,7 @@ const Revise = ({rowId, fetchUrl, mutate}) => {
                         {t("ReviseDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("ReviseDialog.button-revise")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/inspector-expert/index.jsx b/src/components/dashboard/inspector-expert/index.jsx
index d1c959e..137775f 100644
--- a/src/components/dashboard/inspector-expert/index.jsx
+++ b/src/components/dashboard/inspector-expert/index.jsx
@@ -124,6 +124,7 @@ function DashboardInspectorExpertComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
index 555c580..9d1f696 100644
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
@@ -176,7 +176,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
                         {t("ConfirmDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("ConfirmDialog.button-confirm")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/machinary-office/Form/RejectForm.jsx b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
index 61cec90..38bab2f 100644
--- a/src/components/dashboard/machinary-office/Form/RejectForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/machinary-office/index.jsx b/src/components/dashboard/machinary-office/index.jsx
index 2dfbbb1..a1b75d6 100644
--- a/src/components/dashboard/machinary-office/index.jsx
+++ b/src/components/dashboard/machinary-office/index.jsx
@@ -155,6 +155,7 @@ function DashboardMachinaryOfficeComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/navgan-loan-management/Form/UpdateForm.jsx b/src/components/dashboard/navgan-loan-management/Form/UpdateForm.jsx
index 7ac4ff6..c020b18 100644
--- a/src/components/dashboard/navgan-loan-management/Form/UpdateForm.jsx
+++ b/src/components/dashboard/navgan-loan-management/Form/UpdateForm.jsx
@@ -136,7 +136,7 @@ const Update = ({rowId, fetchUrl, mutate}) => {
                         {t("UpdateDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("UpdateDialog.button-update")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/navgan-loan-management/index.jsx b/src/components/dashboard/navgan-loan-management/index.jsx
index 27cf5c0..3664ccb 100644
--- a/src/components/dashboard/navgan-loan-management/index.jsx
+++ b/src/components/dashboard/navgan-loan-management/index.jsx
@@ -134,6 +134,7 @@ function DashboardNavganLoanManagementComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/navgan-province-manager/Form/RejectForm.jsx b/src/components/dashboard/navgan-province-manager/Form/RejectForm.jsx
index 6f81b4a..e4cb4a3 100644
--- a/src/components/dashboard/navgan-province-manager/Form/RejectForm.jsx
+++ b/src/components/dashboard/navgan-province-manager/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/navgan-province-manager/index.jsx b/src/components/dashboard/navgan-province-manager/index.jsx
index d2dc745..4ca0e0b 100644
--- a/src/components/dashboard/navgan-province-manager/index.jsx
+++ b/src/components/dashboard/navgan-province-manager/index.jsx
@@ -156,6 +156,7 @@ function DashboardNavganProvinceManagerComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx
index 135b921..0654985 100644
--- a/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx
@@ -178,7 +178,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
                         {t("ConfirmDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("ConfirmDialog.button-confirm")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/passenger-boss/Form/RejectForm.jsx b/src/components/dashboard/passenger-boss/Form/RejectForm.jsx
index 3688ae7..01dcfc8 100644
--- a/src/components/dashboard/passenger-boss/Form/RejectForm.jsx
+++ b/src/components/dashboard/passenger-boss/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx
index 392cac3..0283fc3 100644
--- a/src/components/dashboard/passenger-boss/index.jsx
+++ b/src/components/dashboard/passenger-boss/index.jsx
@@ -156,6 +156,7 @@ function DashboardPassengerOfficeComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/passenger-office/Form/RejectForm.jsx b/src/components/dashboard/passenger-office/Form/RejectForm.jsx
index b187a2b..b8bfb35 100644
--- a/src/components/dashboard/passenger-office/Form/RejectForm.jsx
+++ b/src/components/dashboard/passenger-office/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/passenger-office/index.jsx b/src/components/dashboard/passenger-office/index.jsx
index 7d9e39a..84953e9 100644
--- a/src/components/dashboard/passenger-office/index.jsx
+++ b/src/components/dashboard/passenger-office/index.jsx
@@ -156,6 +156,7 @@ function DashboardPassengerOfficeComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/province-head-expert/Form/RejectForm.jsx b/src/components/dashboard/province-head-expert/Form/RejectForm.jsx
index e41f95a..d027924 100644
--- a/src/components/dashboard/province-head-expert/Form/RejectForm.jsx
+++ b/src/components/dashboard/province-head-expert/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx b/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx
index 864d607..415ced5 100644
--- a/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx
+++ b/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx
@@ -97,7 +97,7 @@ const Revise = ({rowId, fetchUrl, mutate}) => {
                         {t("ReviseDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("ReviseDialog.button-revise")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/province-head-expert/index.jsx b/src/components/dashboard/province-head-expert/index.jsx
index a647af9..6995d26 100644
--- a/src/components/dashboard/province-head-expert/index.jsx
+++ b/src/components/dashboard/province-head-expert/index.jsx
@@ -125,6 +125,7 @@ function DashboardProvinceHeadExpertComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/refahi-loan-management/Form/UpdateForm.jsx b/src/components/dashboard/refahi-loan-management/Form/UpdateForm.jsx
index fec5b4c..c4d6605 100644
--- a/src/components/dashboard/refahi-loan-management/Form/UpdateForm.jsx
+++ b/src/components/dashboard/refahi-loan-management/Form/UpdateForm.jsx
@@ -136,7 +136,7 @@ const Update = ({rowId, fetchUrl, mutate}) => {
                         {t("UpdateDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("UpdateDialog.button-update")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/refahi-loan-management/index.jsx b/src/components/dashboard/refahi-loan-management/index.jsx
index 4ae7238..3125654 100644
--- a/src/components/dashboard/refahi-loan-management/index.jsx
+++ b/src/components/dashboard/refahi-loan-management/index.jsx
@@ -134,6 +134,7 @@ function DashboardRefahiLoanManagementComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/refahi-province-manager/Form/RejectForm.jsx b/src/components/dashboard/refahi-province-manager/Form/RejectForm.jsx
index f253844..ea7eb72 100644
--- a/src/components/dashboard/refahi-province-manager/Form/RejectForm.jsx
+++ b/src/components/dashboard/refahi-province-manager/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/refahi-province-manager/index.jsx b/src/components/dashboard/refahi-province-manager/index.jsx
index b649948..b7c13ce 100644
--- a/src/components/dashboard/refahi-province-manager/index.jsx
+++ b/src/components/dashboard/refahi-province-manager/index.jsx
@@ -125,6 +125,7 @@ function DashboardRefahiProvinceManagerComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx
index a7f5f37..e6500eb 100644
--- a/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx
+++ b/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx
@@ -127,7 +127,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => {
                     {t("AddDialog.button-cancel")}
                 </Button>
                 <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                        disabled={formik.isSubmitting}>
+                        disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                     {t("AddDialog.button-add")}
                 </Button>
             </DialogActions>
diff --git a/src/components/dashboard/role-management/Form/UpdateForm.jsx b/src/components/dashboard/role-management/Form/UpdateForm.jsx
index 7fd4459..0705af0 100644
--- a/src/components/dashboard/role-management/Form/UpdateForm.jsx
+++ b/src/components/dashboard/role-management/Form/UpdateForm.jsx
@@ -146,7 +146,7 @@ const UpdateForm = ({row, fetchUrl, mutate}) => {
                     {t("UpdateDialog.button-cancel")}
                 </Button>
                 <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                        disabled={formik.isSubmitting}>
+                        disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                     {t("UpdateDialog.button-update")}
                 </Button>
             </DialogActions>
diff --git a/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx b/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx
index d7a41df..2330e0b 100644
--- a/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx
+++ b/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx
@@ -137,7 +137,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
                         {t("RejectDialog.button-cancel")}
                     </Button>
                     <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                            disabled={formik.isSubmitting}>
+                            disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                         {t("RejectDialog.button-reject")}
                     </Button>
                 </DialogActions>
diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx
index 0786159..97640b8 100644
--- a/src/components/dashboard/transportation-assistance/index.jsx
+++ b/src/components/dashboard/transportation-assistance/index.jsx
@@ -156,6 +156,7 @@ function DashboardTransportationAssistanceComponent() {
         ],
         []
     );
+    
     return (
         <DashboardLayouts>
             <Box sx={{px: 3}}>
diff --git a/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx
index 1ab35f9..0a1b5e2 100644
--- a/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx
+++ b/src/components/dashboard/user-management/Form/CreateForm/CreateContent.jsx
@@ -153,7 +153,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => {
                     {t("AddDialog.button-cancel")}
                 </Button>
                 <Button onClick={formik.handleSubmit} variant="contained" color="primary"
-                        disabled={formik.isSubmitting}>
+                        disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
                     {t("AddDialog.button-add")}
                 </Button>
             </DialogActions>
diff --git a/src/components/login-expert/index.jsx b/src/components/login-expert/index.jsx
index 9e8d3b3..221c530 100644
--- a/src/components/login-expert/index.jsx
+++ b/src/components/login-expert/index.jsx
@@ -120,7 +120,7 @@ const LoginComponent = () => {
                                                     fullWidth
                                                     size="medium"
                                                     endIcon={<LoginIcon/>}
-                                                    disabled={props.isSubmitting}
+                                                    disabled={props.isSubmitting || !props.dirty || !props.isValid}
                                                 >
                                                     {t("LoginPage.button_submit")}
                                                 </Button>