Improvements to client disconnect when user manually disconnects. Stay connected will not enforce until user manually connects again.