SIGN IN SIGN UP

Closes #17521: Merged fix from 3.3.

V
Vinay Sajip committed
8ec95b81d53bcadc7bb8defebb5cdf73261823f9