SIGN IN SIGN UP

Merge fixes for #1326113 and #12297 from 3.2

É
Éric Araujo committed
1d175f776836ef0106d06ff2f264635df125340e