Another fix for tracking email not being sent when there are multiple email fields.

#744