diff --git a/src/web/mod_register_web.erl b/src/web/mod_register_web.erl
index a39dc8fb4..7f422c06d 100644
--- a/src/web/mod_register_web.erl
+++ b/src/web/mod_register_web.erl
@@ -536,6 +536,11 @@ form_del_get(Host, Lang) ->
 %%                                    {error, not_allowed} |
 %%                                    {error, invalid_jid}
 register_account(Username, Host, Password) ->
+    case jlib:make_jid(Username, Host, "") of
+	error -> {error, invalid_jid};
+	_ -> register_account2(Username, Host, Password)
+    end.
+register_account2(Username, Host, Password) ->
     case ejabberd_auth:try_register(Username, Host, Password) of
 	{atomic, Res} ->
 	    {success, Res, {Username, Host, Password}};