enhance found_email data, fixes #7752