diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py
index c5a35399b4..2ab81a4e17 100644
--- a/src/pretix/base/models/orders.py
+++ b/src/pretix/base/models/orders.py
@@ -1661,9 +1661,11 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model):
 
     def get_system_answer(self, system_datafield_name):
         if system_datafield_name == 'attendee_name_parts':
-            return self.attendee_name_parts
+            return self.attendee_name
         elif system_datafield_name == 'attendee_email':
             return self.attendee_email
+        elif system_datafield_name == 'company':
+            return self.company
         elif system_datafield_name == 'street':
             return self.street
         elif system_datafield_name == 'zipcode':