SIGN IN SIGN UP

Merge fixes for #13854 and #12157.

R
Richard Oudkerk committed
58ba47f97b582269a71e0376d6d8da58807842c9