can now log in with either username or email