Client Reset button fix + disconnect fix