SIGN IN SIGN UP

Issue #22359: Merge cross-compilation fix from 3.5

M
Martin Panter committed
da28494d0a208410f5f7c1df476da9268908c565