SIGN IN SIGN UP

Issue #29220: Merged fixes from 3.6.

V
Vinay Sajip committed
d4f5001bac6a5d5fafb723a17cf792758fca6ea2