fixed name and email fields swap