Better find email address logic