diff --git a/src/database/admin.rs b/src/database/admin.rs
index b18e50c3..330fecb1 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -13,7 +13,7 @@ use tracing::warn;
 pub enum AdminCommand {
     RegisterAppservice(serde_yaml::Value),
     ListAppservices,
-    CountUsers,
+    CountLocalUsers,
     SendMessage(RoomMessageEventContent),
 }
 
@@ -94,14 +94,14 @@ impl Admin {
                         let state_lock = mutex_state.lock().await;
 
                         match event {
-                            AdminCommand::CountUsers => {
-                                // count() does not return an error on failure...
+                            AdminCommand::CountLocalUsers => {
+                                // count_local_users() only returns with OK(x) where x is the number of found accounts
                                 if let Ok(usercount) = guard.users.count_local_users() {
-                                    let message = format!("Found {} total user accounts", usercount);
+                                    let message = format!("Found {} local user account(s)", usercount);
                                     send_message(RoomMessageEventContent::text_plain(message), guard, &state_lock);
                                 } else {
-                                    // ... so we simply spit out a generic non-explaining-info in case count() did not return Ok()
-                                    send_message(RoomMessageEventContent::text_plain("Unable to count users"), guard, &state_lock);
+                                    // if count_local_users() only returns with OK(x), then why is this? ;-)
+                                    send_message(RoomMessageEventContent::text_plain("Unable to count local users"), guard, &state_lock);
                                 }
                             }
                             AdminCommand::RegisterAppservice(yaml) => {
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 0236c839..b1dd103c 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -1532,7 +1532,7 @@ impl Rooms {
                                     db.admin.send(AdminCommand::ListAppservices);
                                 }
                                 "count_local_users" => {
-                                    db.admin.send(AdminCommand::CountUsers);
+                                    db.admin.send(AdminCommand::CountLocalUsers);
                                 }
                                 "get_auth_chain" => {
                                     if args.len() == 1 {