SIGN IN SIGN UP

Issue #5622: merge fix from 3.2.

N
Ned Deily committed
33cb5c9017df9f0aeb52b90cc8cd7ee37dd5f136