SIGN IN SIGN UP

Issue #23943: Restore extra fixes lost in merge 4fb2075952a4

M
Martin Panter committed
3e5b1d3cf50b15272fdb4d06d05d00a42d1d1737
Parent: eb99570