Can now login with either username or email address