Fix user join and user leave features