diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index 6c56a9e0d..072efe267 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -928,6 +928,25 @@ class pmDynaform
                         $json->options = G::json_decode($newVariable["VAR_ACCEPTED_VALUES"]);
                     }
                 }
+                //update variable
+                if ($key === "var_name" && $json->var_uid === $oldVariable["VAR_UID"]) {
+                    $json->var_name = $newVariable["VAR_NAME"];
+                }
+                if ($key === "var_field_type" && $json->var_uid === $oldVariable["VAR_UID"]) {
+                    $json->var_field_type = $newVariable["VAR_FIELD_TYPE"];
+                }
+                if ($key === "var_dbconnection" && $json->var_uid === $oldVariable["VAR_UID"]) {
+                    $json->var_dbconnection = $newVariable["VAR_DBCONNECTION"];
+                }
+                if ($key === "var_dbconnection_label" && $json->var_uid === $oldVariable["VAR_UID"]) {
+                    $json->var_dbconnection_label = $newVariable["VAR_DBCONNECTION_LABEL"];
+                }
+                if ($key === "var_sql" && $json->var_uid === $oldVariable["VAR_UID"]) {
+                    $json->var_sql = $newVariable["VAR_SQL"];
+                }
+                if ($key === "var_accepted_values" && $json->var_uid === $oldVariable["VAR_UID"]) {
+                    $json->var_accepted_values = G::json_decode($newVariable["VAR_ACCEPTED_VALUES"]);
+                }
             }
         }
     }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
index 788631004..87dc55e2b 100755
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
@@ -135,6 +135,7 @@ class Variable
                 $dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid());
 
                 $oldVariable = array(
+                    "VAR_UID" => $variable->getVarUid(),
                     "VAR_NAME" => $variable->getVarName(),
                     "VAR_FIELD_TYPE" => $variable->getVarFieldType(),
                     "VAR_DBCONNECTION" => $variable->getVarDbconnection(),
@@ -182,6 +183,7 @@ class Variable
                     //update dynaforms
                     $dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid());
                     $newVariable = array(
+                        "VAR_UID" => $variable->getVarUid(),
                         "VAR_NAME" => $variable->getVarName(),
                         "VAR_FIELD_TYPE" => $variable->getVarFieldType(),
                         "VAR_DBCONNECTION" => $variable->getVarDbconnection(),