changed login to use username/password instead of email/password