diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index a95c9c33d..2f99c9e44 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -745,18 +745,12 @@ class Derivation
 
                         $taskNextDel = \TaskPeer::retrieveByPK($nextDel["TAS_UID"]);
 
-                        if (!is_null($taskNextDel) && $taskNextDel->getTasType() == "SCRIPT-TASK") {
-                           if (!isset($nextDel["USR_UID"])) {
-                               $nextDel["USR_UID"] = "";
-                           }
-                        }
-
                         $iNewDelIndex = $this->doDerivation( $currentDelegation, $nextDel, $appFields, $aSP );
 
                         //Execute Script-Task
                         $scriptTask = new \ProcessMaker\BusinessModel\ScriptTask();
 
-                        $appFields = $scriptTask->execScriptByActivityUid($nextDel["TAS_UID"], $appFields);
+                        $appFields["APP_DATA"] = $scriptTask->execScriptByActivityUid($nextDel["TAS_UID"], $appFields);
 
                         //Create record in table APP_ASSIGN_SELF_SERVICE_VALUE
                         $task = new Task();
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ScriptTask.php b/workflow/engine/src/ProcessMaker/BusinessModel/ScriptTask.php
index 8b2b056f1..aefe6a862 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ScriptTask.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ScriptTask.php
@@ -602,18 +602,23 @@ class ScriptTask
 
                     if (!is_null($trigger)) {
                         $pmScript = new \PMScript();
-                        $pmScript->setFields($arrayApplicationData);
+                        $pmScript->setFields($arrayApplicationData["APP_DATA"]);
                         $pmScript->setScript($trigger->getTriWebbot());
 
                         $result = $pmScript->execute();
 
-                        $arrayApplicationData = $pmScript->aFields;
+                        $arrayApplicationData["APP_DATA"] = $pmScript->aFields;
+
+                        $case = new \Cases();
+
+                        $result = $case->updateCase($arrayApplicationData["APP_UID"], $arrayApplicationData);
+
                     }
                 }
             }
 
             //Return
-            return $arrayApplicationData;
+            return $arrayApplicationData["APP_DATA"];
         } catch (\Exception $e) {
             throw $e;
         }
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 01855d3cc..0073eae68 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -192,6 +192,13 @@ class BpmnWorkflow extends Project\Bpmn
             }
         }
 
+        $activityCurrent = \BpmnActivityPeer::retrieveByPK($actUid);
+
+        if ($activityCurrent->getActType() == "TASK" && $activityCurrent->getActTaskType() == "SCRIPTTASK") {
+            $taskData["TAS_TYPE"] = "SCRIPT-TASK";
+            $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
+        }
+
         $this->wp->addTask($taskData);
 
         return $actUid;
@@ -221,10 +228,12 @@ class BpmnWorkflow extends Project\Bpmn
 
         if ($activityBefore->getActTaskType() != "SCRIPTTASK" && $activityCurrent->getActTaskType() == "SCRIPTTASK") {
             $taskData["TAS_TYPE"] = "SCRIPT-TASK";
+            $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
         }
 
         if ($activityBefore->getActTaskType() == "SCRIPTTASK" && $activityCurrent->getActTaskType() != "SCRIPTTASK") {
             $taskData["TAS_TYPE"] = "NORMAL";
+            $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
 
             $scriptTask = new \ProcessMaker\BusinessModel\ScriptTask();
 
@@ -583,7 +592,7 @@ class BpmnWorkflow extends Project\Bpmn
                     $messageEventDefinition->delete($arrayMessageEventDefinitionData["MSGED_UID"]);
                 }
             }
-            
+
             //Email-Event - Delete
             $arrayEventType   = array("END", "INTERMEDIATE");
             $arrayEventMarker = array("EMAIL");
@@ -874,7 +883,7 @@ class BpmnWorkflow extends Project\Bpmn
 
                                             $result = $this->wp->addRoute($activityUid, $taskUid, $routeType, $routeCondition, $routeDefault);
                                             $result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL");
-                                            break;    
+                                            break;
                                         default:
                                             //EMPTY //and others types
                                             $result = $this->wp->addRoute($activityUid, -1, $routeType, $routeCondition, $routeDefault);
@@ -1069,7 +1078,7 @@ class BpmnWorkflow extends Project\Bpmn
 
                                             $result = $this->wp->addRoute($activity["ACT_UID"], $taskUid, "SEQUENTIAL");
                                             $result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL");
-                                            break;    
+                                            break;
                                         default:
                                             //EMPTY //This it's already implemented
                                             //and others types