Can now login using username or email