Added auto rejoin to to-do