Fix signin regression

This PR should fix the following card: https://trello.com/c/fY28WZBJ