SIGN IN SIGN UP

Issue #15533: Merge fix from 3.3.

C
Chris Jerdonek committed
1e0a88a11dbbc421fe4e71834a053eb143f9c698