diff --git a/web/src/settings_users.ts b/web/src/settings_users.ts
index 6a0e3a6fc0..4325d65376 100644
--- a/web/src/settings_users.ts
+++ b/web/src/settings_users.ts
@@ -470,7 +470,7 @@ function human_info(person: User): {
 }
 
 function set_text_search_value($table: JQuery, value: string): void {
-    $table.closest(".user-settings-section").find(".search").val(value);
+    $table.closest(".user-or-bot-settings-section").find(".search").val(value);
 }
 
 let bot_list_widget: ListWidgetType<number, BotInfo>;
@@ -550,8 +550,8 @@ function active_create_table(active_users: number[]): void {
     $("#admin_users_table").show();
 }
 
-function handle_clear_button_for_users($tbody: JQuery): void {
-    const $container = $tbody.closest(".user-settings-section");
+function handle_clear_button_for_table_search_input($tbody: JQuery): void {
+    const $container = $tbody.closest(".user-or-bot-settings-section");
     $container.on("click", ".clear-filter", (e) => {
         e.stopPropagation();
         e.preventDefault();
@@ -783,7 +783,7 @@ function handle_filter_change($tbody: JQuery, section: UserSettingsSection): voi
     // can't use that, because we're also filtering on Role with our
     // custom predicate.
     $tbody
-        .closest(".user-settings-section")
+        .closest(".user-or-bot-settings-section")
         .find<HTMLInputElement>(".search")
         .on("input.list_widget_filter", function (this: HTMLInputElement) {
             add_value_to_filters(section, "text_search", this.value.toLocaleLowerCase());
@@ -797,7 +797,7 @@ function active_handle_events(): void {
     handle_deactivation($tbody);
     handle_reactivation($tbody);
     handle_edit_form($tbody);
-    handle_clear_button_for_users($tbody);
+    handle_clear_button_for_table_search_input($tbody);
 }
 
 function deactivated_handle_events(): void {
@@ -807,7 +807,7 @@ function deactivated_handle_events(): void {
     handle_deactivation($tbody);
     handle_reactivation($tbody);
     handle_edit_form($tbody);
-    handle_clear_button_for_users($tbody);
+    handle_clear_button_for_table_search_input($tbody);
 }
 
 function bots_handle_events(): void {
diff --git a/web/templates/settings/active_user_list_admin.hbs b/web/templates/settings/active_user_list_admin.hbs
index 4bc9387a63..b979b7443b 100644
--- a/web/templates/settings/active_user_list_admin.hbs
+++ b/web/templates/settings/active_user_list_admin.hbs
@@ -1,4 +1,4 @@
-<div id="admin-active-users-list" class="user-settings-section" data-user-settings-section="active">
+<div id="admin-active-users-list" class="user-settings-section user-or-bot-settings-section" data-user-settings-section="active">
 
     <div class="settings_panel_list_header">
         <h3>{{t "Users"}}</h3>
diff --git a/web/templates/settings/bot_list_admin.hbs b/web/templates/settings/bot_list_admin.hbs
index 4748ec7d91..4d9e51fce9 100644
--- a/web/templates/settings/bot_list_admin.hbs
+++ b/web/templates/settings/bot_list_admin.hbs
@@ -1,4 +1,4 @@
-<div id="admin-bot-list" class="settings-section" data-name="bot-list-admin">
+<div id="admin-bot-list" class="settings-section user-or-bot-settings-section" data-name="bot-list-admin">
     <div class="bot-settings-tip banner-wrapper" id="admin-bot-settings-tip">
     </div>
     <div class="clear-float"></div>
diff --git a/web/templates/settings/deactivated_users_admin.hbs b/web/templates/settings/deactivated_users_admin.hbs
index a7425315d2..6f8996f172 100644
--- a/web/templates/settings/deactivated_users_admin.hbs
+++ b/web/templates/settings/deactivated_users_admin.hbs
@@ -1,4 +1,4 @@
-<div id="admin-deactivated-users-list" class="user-settings-section" data-user-settings-section="deactivated">
+<div id="admin-deactivated-users-list" class="user-settings-section user-or-bot-settings-section" data-user-settings-section="deactivated">
     <div class="clear-float"></div>
 
     <div class="settings_panel_list_header">