diff --git a/Rakefile b/Rakefile
index da12a3d50..b93036c8b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -43,10 +43,12 @@ task :build => [:required] do
 
     pmUIDir = targetDir + "/pmUI"
     mafeDir = targetDir + "/mafe"
+    pmdynaformDir = targetDir + "/pmdynaform"
 
-    prepareDirs([pmUIDir, mafeDir, jsTargetDir, cssTargetDir, cssImagesTargetDir, imgTargetDir, pmUIFontsDir])
+    prepareDirs([pmUIDir, mafeDir, pmdynaformDir, jsTargetDir, cssTargetDir, cssImagesTargetDir, imgTargetDir, pmUIFontsDir])
 
     buildPmUi(Dir.pwd + "/vendor/colosa/pmUI", targetDir, mode)
+    buildPmdynaform(Dir.pwd + "/vendor/colosa/pmDynaform", targetDir, mode)
     buildMafe(Dir.pwd + "/vendor/colosa/MichelangeloFE", targetDir, mode)
 
     pmuiHash = getHash(Dir.pwd + "/vendor/colosa/pmUI")
@@ -134,6 +136,20 @@ def buildPmUi(homeDir, targetDir, mode)
     puts "\nPMUI Build Finished".magenta
 end
 
+def buildPmdynaform(homeDir, targetDir, mode)
+  puts "\nBuilding PmDynaform library".green.bold
+  
+  # Defining target directories
+  pmdynaformDir = targetDir + "/pmdynaform"
+  
+  executeInto(homeDir, [ "default"])
+
+  system("cp -r #{homeDir}/build #{pmdynaformDir}")
+  system("cp -r #{homeDir}/libs #{pmdynaformDir}")
+  
+  puts "\nPmDynaform Build Finished!".magenta
+end
+
 def buildMafe(homeDir, targetDir, mode)
     puts "\nBuilding PM Michelangelo FE".green.bold
 
diff --git a/composer.json b/composer.json
index 2c86e6700..2f7ee0bcf 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,8 @@
         "jquery/jquery": "1.10.2",
         "underscore/underscore": "1.5.2",
         "colosa/pmUI": "dev-master",
-        "colosa/MichelangeloFE": "dev-master"
+        "colosa/MichelangeloFE": "dev-master",
+        "colosa/pmdynaform": "dev-master"
     },
     "require-dev":{
         "guzzle/guzzle":"~3.1.1",
diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php
index 6db4dfcbd..2499b60f1 100755
--- a/workflow/engine/classes/class.dynaformEditor.php
+++ b/workflow/engine/classes/class.dynaformEditor.php
@@ -238,7 +238,7 @@ class dynaformEditor extends WebResource
         var DYNAFORM_URL="' . $Parameters['URL'] . '";
         leimnud.event.add(window,"load",function(){ loadEditor(); });
         ');
-        $oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLogged__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";');
+        $oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLoggedDE__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";');
 
         $arrayParameterAux = $Parameters;
         $arrayParameterAux["DYNAFORM_NAME"] = base64_encode($arrayParameterAux["DYNAFORM_NAME"]);
diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js
index ca9a4a383..372c297fb 100755
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -416,13 +416,6 @@ Ext.onReady(function(){
         text: _('ID_EDIT'),
         iconCls: 'button_menu_ext ss_sprite  ss_pencil',
         handler: editProcess
-      },{
-        id: 'edit_with_classic_editor',
-        text: 'Edit with classic editor',
-        iconCls: 'button_menu_ext ss_sprite  ss_pencil',
-        handler: function() {
-            editProcess("classic");
-        }
       }, {
         id: 'activator2',
         text: '',