diff --git a/config/alfresco/workflow/adhoc.bpmn20.xml b/config/alfresco/workflow/adhoc.bpmn20.xml
index 7f11df1dea..c4ed057a25 100644
--- a/config/alfresco/workflow/adhoc.bpmn20.xml
+++ b/config/alfresco/workflow/adhoc.bpmn20.xml
@@ -23,7 +23,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                      if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                      if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                       if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>
@@ -49,7 +49,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                         
                         if (wf_notifyMe)
diff --git a/config/alfresco/workflow/parallel-review-group.bpmn20.xml b/config/alfresco/workflow/parallel-review-group.bpmn20.xml
index cf7ad4ea68..0a63335372 100644
--- a/config/alfresco/workflow/parallel-review-group.bpmn20.xml
+++ b/config/alfresco/workflow/parallel-review-group.bpmn20.xml
@@ -55,7 +55,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>
@@ -112,7 +112,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                         
                         // Set parallel review params on task, to be kept in history
@@ -140,7 +140,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                         
                         // Set parallel review params on task, to be kept in history
diff --git a/config/alfresco/workflow/parallel-review.bpmn20.xml b/config/alfresco/workflow/parallel-review.bpmn20.xml
index f48f78d24e..918a1cfbe0 100644
--- a/config/alfresco/workflow/parallel-review.bpmn20.xml
+++ b/config/alfresco/workflow/parallel-review.bpmn20.xml
@@ -37,7 +37,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>
@@ -94,7 +94,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                         
                         // Set parallel review params on task, to be kept in history
@@ -122,7 +122,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                         
                         // Set parallel review params on task, to be kept in history
diff --git a/config/alfresco/workflow/review-pooled.bpmn20.xml b/config/alfresco/workflow/review-pooled.bpmn20.xml
index f6cdd9ed34..31ddc17116 100644
--- a/config/alfresco/workflow/review-pooled.bpmn20.xml
+++ b/config/alfresco/workflow/review-pooled.bpmn20.xml
@@ -67,7 +67,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>
@@ -96,7 +96,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>
diff --git a/config/alfresco/workflow/review.bpmn20.xml b/config/alfresco/workflow/review.bpmn20.xml
index 9c30cc7691..70a4bdf19c 100644
--- a/config/alfresco/workflow/review.bpmn20.xml
+++ b/config/alfresco/workflow/review.bpmn20.xml
@@ -23,7 +23,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>
@@ -66,7 +66,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>
@@ -88,7 +88,7 @@
                <activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
                   <activiti:field name="script">
                      <activiti:string>
-                        if (typeof bpm_workflowDueDate != 'undefined') task.setVariableLocal('bpm_dueDate', bpm_workflowDueDate);
+                        if (typeof bpm_workflowDueDate != 'undefined') task.dueDate = bpm_workflowDueDate
                         if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
                      </activiti:string>
                   </activiti:field>