diff --git a/src/database/admin.rs b/src/database/admin.rs
index 5ea872e8..b18e50c3 100644
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@@ -96,7 +96,7 @@ impl Admin {
                         match event {
                             AdminCommand::CountUsers => {
                                 // count() does not return an error on failure...
-                                if let Ok(usercount) = guard.users.count() {
+                                if let Ok(usercount) = guard.users.count_local_users() {
                                     let message = format!("Found {} total user accounts", usercount);
                                     send_message(RoomMessageEventContent::text_plain(message), guard, &state_lock);
                                 } else {
diff --git a/src/database/users.rs b/src/database/users.rs
index d4bf4890..5a32f16a 100644
--- a/src/database/users.rs
+++ b/src/database/users.rs
@@ -77,11 +77,23 @@ impl Users {
     }
 
     /// Returns the number of users registered on this server.
+    /// It really returns all users, not only real ones with a
+    /// password to login but also bridge puppets...
     #[tracing::instrument(skip(self))]
     pub fn count(&self) -> Result<usize> {
         Ok(self.userid_password.iter().count())
     }
 
+    /// This method will only count those local user accounts with
+    /// a password thus returning only real accounts on this instance.
+    #[tracing::instrument(skip(self))]
+    pub fn count_local_users(&self) -> Result<usize> {
+        self.userid_password.iter().map(|(key, value)| {
+
+        });
+        Ok(1)
+    }
+
     /// Find out which user an access token belongs to.
     #[tracing::instrument(skip(self, token))]
     pub fn find_from_token(&self, token: &str) -> Result<Option<(Box<UserId>, String)>> {