first pass at handling Civi rejoining