SIGN IN SIGN UP

Merge with 3.3 for Issue #19544 and Issue #7457

J
Jason R. Coombs committed
375dc9b8b42cd9a8b98679c751dc859620956be3