Improved rejoin after kick