SIGN IN SIGN UP

Issues #25232, #24657: Merge two CGI server fixes from 3.4 into 3.5

M
Martin Panter committed
56b76d25dda22ed4d0a66b50e914920a4791f664