SIGN IN SIGN UP

Issue #16447: Merge fix from 3.3.

M
Mark Dickinson committed
548677bb8ce759395e2512420c03ccb184a77bf5