Simplifying the signup flow

Simplifying the signup flow