diff --git a/api/src/main/java/org/openmrs/module/ipd/api/events/IPDEventUtils.java b/api/src/main/java/org/openmrs/module/ipd/api/events/IPDEventUtils.java
index b9da7ab..82426c9 100644
--- a/api/src/main/java/org/openmrs/module/ipd/api/events/IPDEventUtils.java
+++ b/api/src/main/java/org/openmrs/module/ipd/api/events/IPDEventUtils.java
@@ -8,7 +8,7 @@
 
 public class IPDEventUtils {
 
-    public static TaskRequest createNonMedicationTaskRequest(IPDEvent ipdEvent, String name, String taskType) {
+    public static TaskRequest createNonMedicationTaskRequest(IPDEvent ipdEvent, String name, String taskType, Boolean isSystemGenerated) {
         TaskRequest taskRequest = new TaskRequest();
         taskRequest.setName(name);
         taskRequest.setTaskType(taskType);
@@ -17,6 +17,7 @@ public static TaskRequest createNonMedicationTaskRequest(IPDEvent ipdEvent, Stri
         taskRequest.setRequestedStartTime(new Date());
         taskRequest.setIntent(FhirTask.TaskIntent.ORDER);
         taskRequest.setStatus(FhirTask.TaskStatus.REQUESTED);
+        taskRequest.setIsSystemGeneratedTask(isSystemGenerated);
         return taskRequest;
     }
 }
diff --git a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java b/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java
index 9828da5..362e0cb 100644
--- a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java
+++ b/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java
@@ -40,7 +40,7 @@ public void handleEvent(IPDEvent event) {
                 .orElse(null);
         if (eventConfig != null) {
             for(TaskDetail taskDetail : eventConfig.getTasks()) {
-                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(event, taskDetail.getName(), "nursing_activity_system");
+                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(event, taskDetail.getName(), "nursing_activity_system",true);
                 Task task = taskMapper.fromRequest(taskRequest);
                 taskService.saveTask(task);
                 log.info("Task created " + taskDetail.getName());
@@ -49,4 +49,4 @@ public void handleEvent(IPDEvent event) {
 
 
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java b/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java
index e97d620..0ab7c73 100644
--- a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java
+++ b/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java
@@ -39,7 +39,7 @@ public void handleEvent(IPDEvent event) {
             String patientUuid = admittedPatient.getBedPatientAssignment().getPatient().getUuid();
             IPDEvent ipdEvent = new IPDEvent(null, patientUuid, event.getIpdEventType());
             for(TaskDetail taskDetail : eventConfig.getTasks()) {
-                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(ipdEvent, taskDetail.getName(), "nursing_activity_system");
+                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(ipdEvent, taskDetail.getName(), "nursing_activity_system",true);
                 Task task = taskMapper.fromRequest(taskRequest);
                 tasks.add(task);
             }
@@ -57,4 +57,4 @@ private ConfigDetail getEventConfig(IPDEvent event){
                 .orElse(null);
         return eventConfig;
     }
-}
\ No newline at end of file
+}