diff --git a/aleksis/apps/paweljong/schema/event_registration.py b/aleksis/apps/paweljong/schema/event_registration.py
index 8de044036d8e78ffa5d0ff54167c51244f7d192b..f4f9164a7ac01fbc9fe7691d9ef8614c4bc186bc 100644
--- a/aleksis/apps/paweljong/schema/event_registration.py
+++ b/aleksis/apps/paweljong/schema/event_registration.py
@@ -136,12 +136,10 @@ class SendEventRegistrationMutation(graphene.Mutation):
         for field in event.additional_fields.all():
             registration.extended_data[
                 slugify(field.title).replace("-", "_")
-            ] = event_registration["additional_fields"][field.title]
+            ] = event_registration["additional_fields"][field.id]
 
         for field in event_registration["terms"]:
-            if not field.startswith("consent_"):
-                continue
-            pk = int(field.split("_")[1])
+            pk = field
             term = Terms.objects.get(id=pk)
             registration.accepted_terms.add(term)