diff --git a/app/client/src/ce/pages/AdminSettings/config/authentication.tsx b/app/client/src/ce/pages/AdminSettings/config/authentication.tsx
index c251df93c5..76cd28abcd 100644
--- a/app/client/src/ce/pages/AdminSettings/config/authentication.tsx
+++ b/app/client/src/ce/pages/AdminSettings/config/authentication.tsx
@@ -121,7 +121,9 @@ export const FormAuth: AdminConfigType = {
           return false;
         }
 
-        return settings.emailVerificationEnabled && mailEnabled;
+        return (
+          settings.emailVerificationEnabled && mailEnabled && !isMultiOrgEnabled
+        );
       },
     },
     {
@@ -137,7 +139,11 @@ export const FormAuth: AdminConfigType = {
           return false;
         }
 
-        if (!mailEnabled && settings.emailVerificationEnabled) {
+        if (
+          !mailEnabled &&
+          settings.emailVerificationEnabled &&
+          !isMultiOrgEnabled
+        ) {
           return true;
         }
 
diff --git a/app/client/src/pages/AdminSettings/SettingsForm.tsx b/app/client/src/pages/AdminSettings/SettingsForm.tsx
index 386222b971..ac4c240c1f 100644
--- a/app/client/src/pages/AdminSettings/SettingsForm.tsx
+++ b/app/client/src/pages/AdminSettings/SettingsForm.tsx
@@ -395,7 +395,8 @@ export default withRouter(
     _.forEach(AdminConfig.settingsMap, (setting, name) => {
       const fieldValue = selector(state, name);
       const doNotUpdate =
-        setting.controlType === SettingTypes.CHECKBOX &&
+        (setting.controlType === SettingTypes.CHECKBOX ||
+          setting.controlType === SettingTypes.TOGGLE) &&
         !settingsConfig[name] &&
         !fieldValue;