SIGN IN SIGN UP

Issue #17149: merge fix from 3.3.

M
Mark Dickinson committed
1b901baee592edfdf62de2302d786bc8334f65b1