SIGN IN SIGN UP

Issue #16015: Merge fix from 3.2.

C
Chris Jerdonek committed
9118a79c7c410d71725cd52cde310c8e224ac8f0