diff --git a/src/ejabberd_auth_mnesia.erl b/src/ejabberd_auth_mnesia.erl
index 2e9ef5c94..dee3774db 100644
--- a/src/ejabberd_auth_mnesia.erl
+++ b/src/ejabberd_auth_mnesia.erl
@@ -36,7 +36,7 @@
 -export([start/1, set_password/3, check_password/4,
 	 check_password/6, try_register/3,
 	 dirty_get_registered_users/0, get_vh_registered_users/1,
-	 get_vh_registered_users/2,
+	 get_vh_registered_users/2, init_db/0,
 	 get_vh_registered_users_number/1,
 	 get_vh_registered_users_number/2, get_password/2,
 	 get_password_s/2, is_user_exists/2, remove_user/2,
@@ -59,16 +59,19 @@
 %%% API
 %%%----------------------------------------------------------------------
 start(Host) ->
+    init_db(),
+    update_table(),
+    update_reg_users_counter_table(Host),
+    maybe_alert_password_scrammed_without_option(),
+    ok.
+
+init_db() ->
     mnesia:create_table(passwd,
 			[{disc_copies, [node()]},
 			 {attributes, record_info(fields, passwd)}]),
     mnesia:create_table(reg_users_counter,
 			[{ram_copies, [node()]},
-			 {attributes, record_info(fields, reg_users_counter)}]),
-    update_table(),
-    update_reg_users_counter_table(Host),
-    maybe_alert_password_scrammed_without_option(),
-    ok.
+			 {attributes, record_info(fields, reg_users_counter)}]).
 
 update_reg_users_counter_table(Server) ->
     Set = get_vh_registered_users(Server),
diff --git a/src/mod_roster_sql.erl b/src/mod_roster_sql.erl
index 708a20295..2fc6b112e 100644
--- a/src/mod_roster_sql.erl
+++ b/src/mod_roster_sql.erl
@@ -18,7 +18,7 @@
 	 roster_subscribe/4, get_roster_by_jid_with_groups/3,
 	 remove_user/2, update_roster/4, del_roster/3, transaction/2,
 	 read_subscription_and_groups/3, get_only_items/2,
-	 import/3, export/1]).
+	 import/3, export/1, raw_to_record/2]).
 
 -include("mod_roster.hrl").
 -include("ejabberd_sql_pt.hrl").