Fix email fields