SIGN IN SIGN UP

Merge #18952 fix from 3.3

N
Nick Coghlan committed
ff6382b40dfe6c0c978f25f027a72ac91c5449a6