Fix improper quitting of users