Login Using Email Address In Addition To Username

Currently my members login with Username but I see that many of them are resetting their passwords because they're trying to login with email address.

Can we make it an option that they can use either username or email address please.