diff --git a/src/views/profile/Improvement.vue b/src/views/profile/Improvement.vue
index 9aa7e7823..7175a1b02 100644
--- a/src/views/profile/Improvement.vue
+++ b/src/views/profile/Improvement.vue
@@ -1,11 +1,12 @@
 <template>
-  <GenericCreateUpdatePage v-bind="$data" />
+  <GenericCreateUpdatePage v-bind="$data" @getObjectDone="disableMFAFieldIfNeed" />
 </template>
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
 import { Required } from '@/components/Form/DataForm/rules'
 import { PhoneInput } from '@/components/Form/FormFields'
+import store from '@/store'
 
 export default {
   name: 'Improvement',
@@ -86,6 +87,15 @@ export default {
         return 'put'
       }
     }
+  },
+  methods: {
+    disableMFAFieldIfNeed(user) {
+      const adminUserIsNeed = (user?.is_superuser || user?.is_org_admin) &&
+        store.getters.publicSettings['SECURITY_MFA_AUTH'] === 2
+      if (store.getters.publicSettings['SECURITY_MFA_AUTH'] === 1 || adminUserIsNeed || user?.mfa_level.value === 2) {
+        this.fieldsMeta['mfa_level'].disabled = true
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index af54ccdd8..b41aee2f6 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -236,7 +236,6 @@ export default {
         store.getters.publicSettings['SECURITY_MFA_AUTH'] === 2
       if (store.getters.publicSettings['SECURITY_MFA_AUTH'] === 1 || adminUserIsNeed) {
         this.fieldsMeta['mfa_level'].disabled = true
-        this.fieldsMeta['mfa_level'].helpText = this.$t('GlobalDisableMfaMsg')
       }
     }
   }