Fixed signup issues and added username + email to signup