SIGN IN SIGN UP

Fixes #25844: Merged fix from 3.5.

V
Vinay Sajip committed
67dbd0d73c09821feb975208ee5be41a282a0856