Added the ability to log in via username as well as email