SIGN IN SIGN UP

merge from 3.2 - Correcting issue 12576 fix, which resulted in buildbot failures.

S
Senthil Kumaran committed
4d90b19373a7ed83dee2291f82167842ed738bf2