SIGN IN SIGN UP

Issue #17007: Merged minor changes from 3.3.

V
Vinay Sajip committed
e461f7939ddc39e4acb0cc02ce439cacb48991c5