SIGN IN SIGN UP

Merge from 3.3 (issue #15209)

N
Nick Coghlan committed
b4b8f234d4407492c4493e3a16bc8263139c7869