SIGN IN SIGN UP

Issue #21088: Merge from 3.4.

L
Larry Hastings committed
f19a40071479eef0c8c65cb900d2cecbe00a72f1