SIGN IN SIGN UP

Issue #16348: merge fix from 3.2.

M
Mark Dickinson committed
d3405edcdc36b5fefd7ac29649374a4e8c80ad64