SIGN IN SIGN UP

Merge fix for #11560 from 3.2

N
Nick Coghlan committed
e047f66644c83e7f0c0ce944cfd54c303f220067