Changed email fields to use the TrimmedText field