Added ability to search for users based on email or user name.