Refactor login and signup to work together with the extra authentication screen

Finish signup when API is up and running