SIGN IN SIGN UP

Issue #9154: Merge fix from 3.2.

M
Mark Dickinson committed
b63fd2a4084c99178f5218abc387d6b9bfdf25bc