SIGN IN SIGN UP

Issue #26638: Merge option warning fixes from 3.5 into 3.6

M
Martin Panter committed
944078786797b03b415d76b0b2d7f3fb8570b9a4