username or email can be used for login

Added condition for username or email for login.
Making it easier to remember login