diff --git a/Rakefile b/Rakefile
index 30f7e8c48..40f0a5ebb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -243,6 +243,7 @@ def buildMafe(homeDir, targetDir, mode)
         "#{homeDir}/lib/jQueryLayout/jquery.layout.min.js" => "#{jsTargetDir}/jquery.layout.min.js",
         "#{homeDir}/lib/modernizr/modernizr.js" => "#{jsTargetDir}/modernizr.js"
     })
+    system "cp -rf #{homeDir}/src/formDesigner/img/* #{mafeDir}/../img"
 
     puts "\nMichelangelo FE Build Finished\n".magenta
 end
diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index 3a922e9a3..9c3328886 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -82,7 +82,7 @@ class Derivation
                 }
 
                 $arrayTaskData["NEXT_TASK"]["USR_UID"] = "";
-                $arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = array("USR_UID" => "");
+                $arrayTaskData["NEXT_TASK"]["USER_ASSIGNED"] = array("USR_UID" => "", "USR_USERNAME" => "");
             } else {
                 //3. Load the task information of normal NEXT_TASK
                 $arrayTaskData["NEXT_TASK"] = $task->load($arrayTaskData["ROU_NEXT_TASK"]); //print $arrayTaskData["ROU_NEXT_TASK"]." **** ".$arrayTaskData["NEXT_TASK"]["TAS_TYPE"]."<hr>";