Added basic join/leave check
Fixed bug which would cause user info to be lost upon logoff