Added ability to search by username and email address