Fixed #2, proper user disconnect handling ( fixed #1 too )