Added ability to search for existing user based on name or email