Changing Who lookup to use email address.