SIGN IN SIGN UP

Port import fixes from 2.7.

A
Antoine Pitrou committed
581616624da7918e1050f3d02d0fb1e66e68c332