SIGN IN SIGN UP

Merge #11401 fix from 3.1.

R
R David Murray committed
4e4326829f2997624261628081110bb87c090711