diff --git a/pom.xml b/pom.xml
index 6a8ae7e..14366e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   </parent>
   <groupId>nl.koppeltaal</groupId>
   <artifactId>spring-boot-starter-smart-service</artifactId>
-  <version>1.1.50-SNAPSHOT</version>
+  <version>1.1.51-SNAPSHOT</version>
   <name>Koppeltaal-2.0-Spring-SMART-Service</name>
   <description>spring-boot-starter-smart-service project to connect to a FHIR Store that works according to
   the SMART Backend Service flow (https://hl7.org/fhir/uv/bulkdata/authorization/index.html)</description>
diff --git a/src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/service/fhir/TaskFhirClientService.java b/src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/service/fhir/TaskFhirClientService.java
index 52d06d0..440610c 100644
--- a/src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/service/fhir/TaskFhirClientService.java
+++ b/src/main/java/nl/koppeltaal/spring/boot/starter/smartservice/service/fhir/TaskFhirClientService.java
@@ -61,7 +61,9 @@ public Task getOrCreateTask(Patient patient, Practitioner practitioner, Activity
 			}
 			task.addIdentifier(taskIdentifier);
 
-			task.setOwner(buildReference(patient));
+			Reference patientReference = buildReference(patient);
+			task.setFor(patientReference);
+			task.setOwner(patientReference);
 			if (practitioner != null) {
 				task.setRequester(buildReference(practitioner));
 			}