diff --git a/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java b/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java
index 322754c..dfcd064 100644
--- a/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java
+++ b/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java
@@ -50,9 +50,9 @@ public AccessTokenPayload build(
             final SubjectResponse subjectResponse,
             final OccurrenceInfoResponse occurrenceInfo) {
         final AccessTokenConditions accessTokenConditions = new AccessTokenConditions();
-        accessTokenConditions.setLang(occurrenceInfo.getLanguage());
-        accessTokenConditions.setFnt(subjectResponse.getForename());
-        accessTokenConditions.setGnt(subjectResponse.getLastname());
+        accessTokenConditions.setLang(occurrenceInfo.getLanguage());        
+        accessTokenConditions.setGnt(subjectResponse.getForename());
+        accessTokenConditions.setFnt(subjectResponse.getLastname());
         accessTokenConditions.setCoa(occurrenceInfo.getCountryOfArrival());
         accessTokenConditions.setCod(occurrenceInfo.getCountryOfDeparture());
         accessTokenConditions.setRoa(occurrenceInfo.getRegionOfArrival());