SIGN IN SIGN UP

Issue #16305: Merge fix from 3.3.

M
Mark Dickinson committed
9588593b791d2c0052296f3df462350280dd3747