diff --git a/config/alfresco/messages/workflow-messages.properties b/config/alfresco/messages/workflow-messages.properties
index b3c3471fad..c6053ad28e 100644
--- a/config/alfresco/messages/workflow-messages.properties
+++ b/config/alfresco/messages/workflow-messages.properties
@@ -64,5 +64,5 @@ wf_workflowmodel.association.wf_assignee.title=Assignee
 wf_workflowmodel.association.wf_assignee.description=Who's doing the task
 wf_workflowmodel.type.wf_adhocTask.title=Adhoc Task
 wf_workflowmodel.type.wf_adhocTask.description=Adhoc Task allocated by colleague
-wf_workflowmodel.type.wf_completedTask.title=Adhoc Task Completed
-wf_workflowmodel.type.wf_completedTask.description=Adhoc Task Completed
+wf_workflowmodel.type.wf_completedAdhocTask.title=Adhoc Task Completed
+wf_workflowmodel.type.wf_completedAdhocTask.description=Adhoc Task Completed
diff --git a/config/alfresco/model/workflowModel.xml b/config/alfresco/model/workflowModel.xml
index e4ca2b94c0..0185344dee 100644
--- a/config/alfresco/model/workflowModel.xml
+++ b/config/alfresco/model/workflowModel.xml
@@ -150,7 +150,7 @@
          <parent>wf:baseAdhocTask</parent>
       </type>
 
-      <type name="wf:completedTask">
+      <type name="wf:completedAdhocTask">
          <title>Completed Adhoc Task</title>
          <parent>wf:baseAdhocTask</parent>
       </type>
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScript.java b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScript.java
index d3a40d7435..b3bab2b2db 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScript.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScript.java
@@ -17,6 +17,7 @@
 package org.alfresco.repo.workflow.jbpm;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -74,7 +75,21 @@ public class AlfrescoJavaScript extends JBPMSpringActionHandler
         // extract action configuration
         String expression = null;
         List<VariableAccess> variableAccesses = null;        
-        if (script.isTextOnly())
+
+        // is the script specified as text only, or as explicit expression, variable elements
+        boolean isTextOnly = true;
+        Iterator<Element> iter = script.elementIterator();
+        while (iter.hasNext())
+        {
+           Element element = iter.next();
+           if (element.getNodeType() == Element.ELEMENT_NODE)
+           {
+              isTextOnly = false;
+           }
+        }
+        
+        // extract script and variables
+        if (isTextOnly)
         {
             expression = script.getTextTrim();
         }
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/adhoc_task_processdefinition.xml b/source/java/org/alfresco/repo/workflow/jbpm/adhoc_task_processdefinition.xml
index 72bb4f2e79..013fdb6115 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/adhoc_task_processdefinition.xml
+++ b/source/java/org/alfresco/repo/workflow/jbpm/adhoc_task_processdefinition.xml
@@ -12,8 +12,8 @@
           <variable name="adhocpriority" access="write" mapped-name="wf:adhocPriority"/>
           <variable name="adhocdescription" access="write" mapped-name="wf:adhocDescription"/>
           <variable name="notify" access="write" mapped-name="wf:notifyMe"/>
-          <variable name="package" access="write" mapped-name="bpm:package"/>
-          <variable name="context" access="write" mapped-name="bpm:context"/>
+          <variable name="workflowpackage" access="write" mapped-name="bpm:package"/>
+          <variable name="workflowcontext" access="write" mapped-name="bpm:context"/>
         </controller>
       </task>
       <transition name="" to="adhoc"/>
@@ -33,6 +33,8 @@
       <task name="wf:adhocTask" swimlane="assignee">
          <controller>
             <variable name="adhocdescription" access="read" mapped-name="wf:adhocDescription"/>
+            <variable name="workflowpackage" access="read" mapped-name="bpm:package"/>
+            <variable name="workflowcontext" access="read" mapped-name="bpm:context"/>
          </controller>
       </task>
       <transition name="" to="completed">
@@ -42,10 +44,10 @@
               {
                  var mail = actions.create("mail");
                  mail.parameters.to = initiator.properties["cm:email"];
-                 mail.parameters.subject = "Adhoc Task " + adhocDescription;
+                 mail.parameters.subject = "Adhoc Task " + adhocdescription;
                  mail.parameters.from = assignee.properties["cm:email"];
                  mail.parameters.text = "It's done";
-                 mail.execute(package);
+                 mail.execute(workflowpackage);
               }
            </script>
          </action>
@@ -53,9 +55,11 @@
    </task-node>
    
    <task-node name="completed">
-      <task name="wf:completedTask" swimlane="initiator">
+      <task name="wf:completedAdhocTask" swimlane="initiator">
          <controller>
             <variable name="adhocdescription" access="read" mapped-name="wf:adhocDescription"/>
+            <variable name="workflowpackage" access="read" mapped-name="bpm:package"/>
+            <variable name="workflowcontext" access="read" mapped-name="bpm:context"/>
          </controller>
       </task>
       <transition name="" to="end"/>