SIGN IN SIGN UP

Merged fix for issue #12168 from 3.2.

V
Vinay Sajip committed
8dd8d582e3c6d1dd80f5b958284fcb7260209bf3