SIGN IN SIGN UP

Merge assorted fixes from 3.2

A
Antoine Pitrou committed
3731142e190b63ac2a505727329dc0d527346037