SIGN IN SIGN UP

Merge #11488 patch from 3.1.

R
R David Murray committed
1a5201f80d2293cd5ab83f4f3a751fb508f64ea7