SIGN IN SIGN UP

Merge fix for #16163 from 3.3

N
Nick Coghlan committed
685bd4a37a22678b3f97bbbc24da908696c9fcd5