diff --git a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
index c2f53a510..3ecda0e5e 100644
--- a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
+++ b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
@@ -1,4 +1,4 @@
-function dynaFormChanged (frm) {
+function dynaFormChanged(frm) {
     for (var i1 = 0; i1 <= frm.elements.length - 1; i1++) {
         if ((frm.elements[i1].type === "radio" || frm.elements[i1].type === "checkbox") && (frm.elements[i1].checked !== frm.elements[i1].defaultChecked)) {
             return true;
@@ -22,7 +22,7 @@ function dynaFormChanged (frm) {
     return false;
 }
 $(window).load(function () {
-    var data = JSON.parse(jsondata);
+    var data = jsondata;
     window.dynaform = new PMDynaform.core.Project({
         data: data,
         keys: {
@@ -47,15 +47,17 @@ $(window).load(function () {
     var form = document.getElementsByTagName("form")[0];
 
     var el = form.elements;
-    var k = 0;
     var dt = data.items[0].items;
     for (var i = 0; i < dt.length; i++) {
         var dr = dt[i];
         for (var j = 0; j < dr.length; j++) {
             if (dr[j].name) {
-                el[k].name = "form[" + dr[j].name + "]";
+                for (var k = 0; k < el.length; k++) {
+                    if (el[k].name === dr[j].name) {
+                        el[k].name = "form[" + dr[j].name + "]";
+                    }
+                }
             }
-            k = k + 1;
         }
     }
 
diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html
index 92474ecd2..c619734ba 100644
--- a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html
+++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html
@@ -20,7 +20,7 @@
         ###TEMPLATES###
         <script type="text/javascript" src="/lib/pmdynaform/build/js/PMDynaform.js"></script>
         <script type="text/javascript">
-            var jsondata = '{JSON_DATA}';
+            var jsondata = {JSON_DATA};
             var pm_run_outside_main_app = '{PM_RUN_OUTSIDE_MAIN_APP}';
             var dyn_uid = '{DYN_UID}';
             var __DynaformName__ = '{DYNAFORMNAME}';
diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
index 07b493ada..d3b74669c 100644
--- a/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
+++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
@@ -20,13 +20,13 @@
         ###TEMPLATES###
         <script type="text/javascript" src="/lib/pmdynaform/build/js/PMDynaform.js"></script>
         <script type="text/javascript">
-            var jsondata = '{JSON_DATA}';
+            var jsondata = {JSON_DATA};
             var pm_run_outside_main_app = '{PM_RUN_OUTSIDE_MAIN_APP}';
             var dyn_uid = '{DYN_UID}';
             var __DynaformName__ = '{DYNAFORMNAME}';
             var app_uid = '{APP_UID}';
             $(window).load(function () {
-                var data = JSON.parse(jsondata);
+                var data = jsondata;
                 window.dynaform = new PMDynaform.core.Project({
                     data: data
                 });