Improved XMPP JID handling