[Ready][3.9] Avoid guest login collision