SIGN IN SIGN UP

Issue #16096: Merge fixes from 3.3.

M
Mark Dickinson committed
ff9c54aca28592a3eab0bdba1ddd977b441e1e9f