XMPP: fixed join/leave