SIGN IN SIGN UP

Issue #17715: Merge fix from 3.3.

M
Mark Dickinson committed
93196eb44f935de8132fd79e8be215657ea6b600