diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h
index b291b35fde..77af256921 100644
--- a/menu/drivers/shared.h
+++ b/menu/drivers/shared.h
@@ -83,6 +83,8 @@ static INLINE void get_title(const char *label, const char *dir,
       snprintf(title, sizeof_title, "DATABASE CURSOR LIST (FILTER: CERO RATING - %s)", elem0_path);
    else if (!strcmp(label, "deferred_cursor_manager_list_rdb_entry_bbfc_rating"))
       snprintf(title, sizeof_title, "DATABASE CURSOR LIST (FILTER: BBFC RATING - %s)", elem0_path);
+   else if (!strcmp(label, "deferred_cursor_manager_list_rdb_entry_max_users"))
+      snprintf(title, sizeof_title, "DATABASE CURSOR LIST (FILTER: MAX USERS - %s)", elem0_path);
    else if (!strcmp(elem0_label, "deferred_rdb_entry_detail"))
       snprintf(title, sizeof_title, "DATABASE INFO: %s", elem1_label);
    else if (!strcmp(label, "deferred_core_list"))
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 8d55dc78a9..bd174aef97 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -891,10 +891,10 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
       }
       if (db_info_entry->max_users)
       {
-
-         snprintf(tmp, sizeof(tmp), "Max Users: %d", db_info_entry->max_users);
-         menu_list_push(list, tmp, "rdb_entry_max_users",
-               0, 0);
+         if (create_string_list_rdb_entry_int("Max Users",
+               "rdb_entry_max_users", db_info_entry->max_users,
+               path, list) == -1)
+            return -1;
       }
       if (db_info_entry->edge_magazine_rating)
       {
@@ -2322,6 +2322,11 @@ static int deferred_push_cursor_manager_list_deferred_query_subsearch(
       strlcat(query, "releaseyear", sizeof(query));
       add_quotes = false;
    }
+   else if (!strcmp(label, "deferred_cursor_manager_list_rdb_entry_max_users"))
+   {
+      strlcat(query, "users", sizeof(query));
+      add_quotes = false;
+   }
 
    strlcat(query, "':", sizeof(query));
    if (add_quotes)
@@ -3835,7 +3840,8 @@ static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
           !(strcmp(elem0, "rdb_entry_edge_magazine_rating")) ||
           !(strcmp(elem0, "rdb_entry_edge_magazine_issue")) ||
           !(strcmp(elem0, "rdb_entry_releasemonth")) ||
-          !(strcmp(elem0, "rdb_entry_releaseyear"))
+          !(strcmp(elem0, "rdb_entry_releaseyear")) ||
+          !(strcmp(elem0, "rdb_entry_max_users"))
           )
       )
       cbs->action_ok = action_ok_rdb_entry_submenu;
@@ -4294,6 +4300,7 @@ static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
          !strcmp(label, "deferred_cursor_manager_list_rdb_entry_cero_rating") ||
          !strcmp(label, "deferred_cursor_manager_list_rdb_entry_edge_magazine_rating") ||
          !strcmp(label, "deferred_cursor_manager_list_rdb_entry_edge_magazine_issue") ||
+         !strcmp(label, "deferred_cursor_manager_list_rdb_entry_max_users") ||
          !strcmp(label, "deferred_cursor_manager_list_rdb_entry_releasemonth") ||
          !strcmp(label, "deferred_cursor_manager_list_rdb_entry_releaseyear")
          )