SIGN IN SIGN UP

merge from 3.2. Issue #13073 - Address the review comments made by Ezio.

S
Senthil Kumaran committed
91a076a72f22e0c7ad997d46be76f7021a27ba6a