SIGN IN SIGN UP

Merge from 3.4 (for #21226).

E
Eric Snow committed
b7f1be309eb7d2deceb8b6c3f3a4de1e4dcbbe11