added username/password and email