# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1367064687 -3600
# Node ID 8e41b127e44ef268876dcc6b5b75cf32630d1da5
# Parent  8741bb69a7862de3eeabc2da7adc703563ab8197# Parent  e9090966c80313589239d652b14c761c801e0ae6
Merge 0.9->trunk

diff -r 8741bb69a786 -r 8e41b127e44e util/prosodyctl.lua
--- a/util/prosodyctl.lua	Fri Apr 26 12:25:53 2013 +0100
+++ b/util/prosodyctl.lua	Sat Apr 27 13:11:27 2013 +0100
@@ -140,11 +140,12 @@
 	if not host_session then
 		return false, "no-such-host";
 	end
+
+	storagemanager.initialize_host(host);
 	local provider = host_session.users;
 	if not(provider) or provider.name == "null" then
 		usermanager.initialize_host(host);
 	end
-	storagemanager.initialize_host(host);
 	
 	local ok, errmsg = usermanager.create_user(user, password, host);
 	if not ok then
@@ -155,11 +156,12 @@
 
 function user_exists(params)
 	local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
+
+	storagemanager.initialize_host(host);
 	local provider = prosody.hosts[host].users;
 	if not(provider) or provider.name == "null" then
 		usermanager.initialize_host(host);
 	end
-	storagemanager.initialize_host(host);
 	
 	return usermanager.user_exists(user, host);
 end