SIGN IN SIGN UP

Merge issue #26355 fix from 3.6

N
Nick Coghlan committed
c7a24a7330bc18b06bdcb76ab2141d5bbf41372c