Changed username/password to email/password, merged login & signup form