SIGN IN SIGN UP

Merge with 3.3 for Issue #19544 and Issue #6286. Merge is untested. I was unable to test due to bab0cbf86835.

J
Jason R. Coombs committed
0048ae0cc62cba45b197976031f0680d90687ffc