SIGN IN SIGN UP

Fixes #12637: Merged fix from 3.2 and added test.

V
Vinay Sajip committed
8188f585b2c1d21c1b680181f38b45c4234c6865