diff --git a/ChangeLog b/ChangeLog
index 7b251209b..99f7f0c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-17  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/mod_configure.erl: Bugfix: Show only virtual host users
+	on admin disco for all users (EJAB-268) (Thanks to Badlop).
+
 	* src/mod_muc/mod_muc_log.erl: Recognise more URI schemes in
 	logged HTML (EJAB-279) (Thanks to qu1j0t3).
 
diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 541b50318..b0b0c3600 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -408,8 +408,8 @@ get_local_items(Host, ["online users"], _Server, _Lang) ->
 get_local_items(Host, ["all users"], _Server, _Lang) ->
     {result, get_all_vh_users(Host)};
 
-get_local_items(_Host, ["all users", [$@ | Diap]], _Server, _Lang) ->
-    case catch ejabberd_auth:dirty_get_registered_users() of
+get_local_items(Host, ["all users", [$@ | Diap]], _Server, _Lang) ->
+    case catch ejabberd_auth:get_vh_registered_users(Host) of
 	{'EXIT', _Reason} ->
 	    ?ERR_INTERNAL_SERVER_ERROR;
 	Users ->