SIGN IN SIGN UP

Merge: #5712: Preemptively fix some other possible timing issues.

R
R David Murray committed
54bd49d49b7624177f709f195a773be7607dbe4c