diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index 9b84789c0..67bdbbe72 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -50,12 +50,27 @@ class pmDynaform
     public function printView($pm_run_outside_main_app, $application)
     {
         ob_clean();
+
+        $a = $this->clientToken();
+        $clientToken = array(
+            "accessToken" => $a["access_token"],
+            "expiresIn" => $a["expires_in"],
+            "tokenType" => $a["token_type"],
+            "scope" => $a["scope"],
+            "refreshToken" => $a["refresh_token"],
+            "clientId" => $a["client_id"],
+            "clientSecret" => $a["client_secret"]
+        );
+        
         $file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/cases_Step_Pmdynaform_View.html');
         $file = str_replace("{JSON_DATA}", $this->record["DYN_CONTENT"], $file);
         $file = str_replace("{PM_RUN_OUTSIDE_MAIN_APP}", $pm_run_outside_main_app, $file);
         $file = str_replace("{DYN_UID}", $this->dyn_uid, $file);
         $file = str_replace("{DYNAFORMNAME}", $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"], $file);
         $file = str_replace("{APP_UID}", $application, $file);
+        $file = str_replace("{PRJ_UID}", $this->app_data["PROCESS"], $file);
+        $file = str_replace("{WORKSPACE}", $this->app_data["SYS_SYS"], $file);
+        $file = str_replace("{credentials}", json_encode($clientToken), $file);
         echo $file;
         exit();
     }
diff --git a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
index 9d6ab62f8..5f4d5846f 100644
--- a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
+++ b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
@@ -49,9 +49,7 @@ $(window).load(function () {
         data: {},
         keys: window.project.token,
         successCallback: function (xhr, response) {
-            if (response[jsondata.name] && window.project.setData2) {
-                window.project.setData2(response[jsondata.name]);
-            }
+            window.project.setData2(response);
         }
     });
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index a042bc107..20d26716a 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -1439,7 +1439,7 @@ class Cases
         $fields = $case->loadCase($app_uid);
         $_POST['form'] = $app_data;
 
-        if (!is_null($dyn_uid)) {
+        if (!is_null($dyn_uid) && $dyn_uid != '') {
             $oDynaform = \DynaformPeer::retrieveByPK($dyn_uid);
 
             if ($oDynaform->getDynVersion() < 2) {
diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
index cc553b6bd..ed500fe54 100644
--- a/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
+++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
@@ -45,9 +45,7 @@
                     data: {},
                     keys: window.project.token,
                     successCallback: function (xhr, response) {
-                        if (response[jsondata.name] && window.project.setData2) {
-                            window.project.setData2(response[jsondata.name]);
-                        }
+                        window.project.setData2(response);
                     }
                 });
                 $(document).find('form').submit(function (e) {