SIGN IN SIGN UP

merge from 3.1 for issue issue12261.

S
Senthil Kumaran committed
a977acc0feabfe196f325321d7ea0c59bd9e64a4