SIGN IN SIGN UP

Issue #5622: merge fix from 3.1.

N
Ned Deily committed
2d12f96658db7f1257ac8e15908ce0a8ac96f735