Improve user journey

A few tweaks to fix the user journey on signup