SIGN IN SIGN UP

Issue #25136: merge from 3.5

N
Ned Deily committed
b8da1a4feecc387b42d169be472e3a013cebdbc3