diff --git a/ChangeLog b/ChangeLog
index a14833899..4d962b827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-13  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/ejabberd_auth.erl: prevent from calling
+	get_vh_registered_users/2 when not available
+
 2009-02-05  Badlop  <badlop@process-one.net>
 
 	* src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl
index 9f7875e4f..4be455b06 100644
--- a/src/ejabberd_auth.erl
+++ b/src/ejabberd_auth.erl
@@ -185,7 +185,13 @@ get_vh_registered_users(Server) ->
 get_vh_registered_users(Server, Opts) ->
     lists:flatmap(
       fun(M) ->
-	      M:get_vh_registered_users(Server, Opts)
+		case erlang:function_exported(
+		       M, get_vh_registered_users, 2) of
+		    true ->
+			M:get_vh_registered_users(Server, Opts);
+		    false ->
+			M:get_vh_registered_users(Server)
+		end
       end, auth_modules(Server)).
 
 get_vh_registered_users_number(Server) ->