Added ability to log in with email or username