diff --git a/static/js/admin.js b/static/js/admin.js
index 752caa6260..304921d5e4 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -13,6 +13,8 @@ exports.show_or_hide_menu_item = function () {
         item.find("span").text(i18n.t("Organization settings"));
         $(".organization-box [data-name='organization-settings']")
             .find("input, button, select").attr("disabled", true);
+        $(".organization-box [data-name='auth-methods']")
+            .find("input, button, select, checked").attr("disabled", true);
     }
 };
 
diff --git a/templates/zerver/settings_overlay.html b/templates/zerver/settings_overlay.html
index 9239400287..e4c0413a8f 100644
--- a/templates/zerver/settings_overlay.html
+++ b/templates/zerver/settings_overlay.html
@@ -44,11 +44,11 @@
                     <i class="icon icon-vector-smile"></i>
                     <div class="text">{{ _('Custom emoji') }}</div>
                 </li>
-                {% if is_admin %}
                 <li class="admin" tabindex="1" data-section="auth-methods">
                     <i class="icon icon-vector-lock"></i>
                     <div class="text">{{ _('Authentication methods') }}</div>
                 </li>
+                {% if is_admin %}
                 <li class="admin" tabindex="1" data-section="user-list-admin">
                     <i class="icon icon-vector-user"></i>
                     <div class="text">{{ _('Users') }}</div>