Fixed bug with login with either username or email