Fix avatar logic for contact info include