SIGN IN SIGN UP

Issue #17508: Merged fix from 3.2.

V
Vinay Sajip committed
340a4bb2fe38f7d203beb7890d75e0383e3cca7c