SIGN IN SIGN UP

Merge issue #22295 fix from 3.4

N
Nick Coghlan committed
4a4b67951570a8a0452c77a5ebaa98b9ef9fb712