diff --git a/lang/en_US.ini b/lang/en_US.ini
index 2b91046..5a66510 100644
--- a/lang/en_US.ini
+++ b/lang/en_US.ini
@@ -298,4 +298,7 @@ disablemfa = "Disable MFA"
 enable_auto_save = "Enable Auto Save to Drafts"
 explain_autosave = "When enabled, new posts or pages will automatically be saved as a draft every 60 seconds after you start writing."
 login_protect_system = "Login protection system"
-cloudflare_info = "Review Cloudflare's Turnstile documentation: "
\ No newline at end of file
+cloudflare_info = "Review Cloudflare's Turnstile documentation: "
+mfa_config = "Multi Factor Authentication (MFA)"
+set_mfa_globally = "Set the status of MFA"
+explain_mfa = "When enabled, MFA is optional for all users. When disabled, no users can use it and it hides the field on the login page."
\ No newline at end of file
diff --git a/system/admin/views/config-widget.html.php b/system/admin/views/config-widget.html.php
index f1bf7bd..1eea99f 100644
--- a/system/admin/views/config-widget.html.php
+++ b/system/admin/views/config-widget.html.php
@@ -288,6 +288,30 @@
       <input type="text" name="-config-social.youtube" class="form-control" id="social.youtube" value="<?php echo config('social.youtube');?>" placeholder="https://www.youtube.com/user/username">
     </div>
   </div>
+  <br>
+  <h4><?php echo i18n('mfa_config');?></h4>
+  <hr>
+  <div class="form-group row">
+    <label class="col-sm-2 col-form-label"><?php echo i18n('set_mfa_globally');?></label>
+    <div class="col-sm-10">
+      <div class="col-sm-10">
+        <div class="form-check">
+          <input class="form-check-input" type="radio" name="-config-mfa.state" id="mfa.state1" value="true" <?php if (config('mfa.state') === 'true'):?>checked<?php endif;?>>
+          <label class="form-check-label" for="mfa.state1">
+            <?php echo i18n('Enable');?>
+          </label>
+        </div>
+        <div class="form-check">
+          <input class="form-check-input" type="radio" name="-config-mfa.state" id="mfa.state2" value="false" <?php if (config('mfa.state') === 'false'):?>checked<?php endif;?>>
+          <label class="form-check-label" for="mfa.state2">
+            <?php echo i18n('Disable');?>
+          </label>
+        </div>
+      </div>
+	  <small><em><?php echo i18n('explain_mfa');?></em></small>
+    </div>
+  </div>
+  <hr />
   <div class="form-group row">
     <div class="col-sm-10">
       <button type="submit" class="btn btn-primary"><?php echo i18n('Save_Config');?></button>
diff --git a/system/admin/views/layout.html.php b/system/admin/views/layout.html.php
index 5d43bc0..05be81b 100644
--- a/system/admin/views/layout.html.php
+++ b/system/admin/views/layout.html.php
@@ -243,6 +243,7 @@ if (isset($_GET['search'])) {
                   </p>
                 </a>
               </li>
+			  <?php if (config('mfa.state') === 'true'): ?>
               <li class="nav-item">
                 <a href="<?php echo site_url();?>edit/mfa" class="nav-link">
                   <p>
@@ -250,6 +251,7 @@ if (isset($_GET['search'])) {
                   </p>
                 </a>
               </li>
+			  <?php endif;?>
               <li class="nav-item">
                 <a href="<?php echo site_url();?>edit/profile" class="nav-link">
                   <p>
diff --git a/system/admin/views/login.html.php b/system/admin/views/login.html.php
index 3501edc..05d6c46 100644
--- a/system/admin/views/login.html.php
+++ b/system/admin/views/login.html.php
@@ -21,9 +21,11 @@
         } ?>" name="password" placeholder="<?php echo i18n('Password'); ?>"/>
         <br>
         <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
-        <label><?php echo i18n('MFACode');?></label>
-        <input type="text" class="form-control" name="mfacode" placeholder="<?php echo i18n('verify_code'); ?>"/>
-        <br>
+        <?php if (config('mfa.state') === 'true'): ?>
+            <label><?php echo i18n('MFACode');?></label>
+            <input type="text" class="form-control" name="mfacode" placeholder="<?php echo i18n('verify_code'); ?>"/>
+            <br>
+        <?php endif; ?>
         <?php if (config('login.protect.system') === 'google'): ?>
             <script src='https://www.google.com/recaptcha/api.js'></script>
             <div class="g-recaptcha" data-sitekey="<?php echo config("login.protect.public"); ?>"></div>
diff --git a/system/configList.json b/system/configList.json
index b5ea594..70b86f1 100644
--- a/system/configList.json
+++ b/system/configList.json
@@ -87,5 +87,6 @@
     "favicon.image",
     "views.root",
     "views.layout",
-    "autosave.enable"
+    "autosave.enable",
+	"mfa.state"
 ]
\ No newline at end of file