Steven, if its an either or kind of think (which is unclear even though it says "fill one of the fields" ) then a combined field would certainly be a better plan.

What is the error state for when you do a password reset for an account with a username with no email associated?