Users can now login with either email address or username