SIGN IN SIGN UP

Issue #15533: Merge fix from 3.2.

C
Chris Jerdonek committed
28714c8c26d72cfb3cee4d05f9f5b7390cda291b