diff --git a/static/js/settings_org.js b/static/js/settings_org.js
index 7ad1c9f703..98adc9a8d0 100644
--- a/static/js/settings_org.js
+++ b/static/js/settings_org.js
@@ -289,13 +289,12 @@ exports.populate_auth_methods = function (auth_methods) {
             method: {
                 method: key,
                 enabled: auth_methods[key],
+                is_admin: page_params.is_admin,
             },
         }));
     });
     loading.destroy_indicator($('#admin_page_auth_methods_loading_indicator'));
     if (!page_params.is_admin) {
-        $(".organization-box [data-name='auth-methods']")
-            .find("input, button, select, checked").attr("disabled", true);
         var tip_box = $("<div class='tip'></div>")
             .text(i18n.t("Only organization administrators can edit these settings."));
         // Don't prepend a tip to custom emoji settings page. We handle it separately.
diff --git a/static/templates/settings/admin_auth_methods_list.handlebars b/static/templates/settings/admin_auth_methods_list.handlebars
index c0da236962..36fc03275f 100644
--- a/static/templates/settings/admin_auth_methods_list.handlebars
+++ b/static/templates/settings/admin_auth_methods_list.handlebars
@@ -5,7 +5,7 @@
     </td>
     <td>
         <label class="checkbox">
-            <input type="checkbox" {{#if enabled}}checked="checked"{{/if}} />
+            <input type="checkbox" {{#if enabled}}checked="checked"{{/if}} {{#unless is_admin}}disabled{{/unless}}/>
             <span></span>
         </label>
     </td>