Avoid guest login name collisions
Merge pull request #1004 from romainneutron/guest-login-collision

[Ready][3.9] Avoid guest login collision