diff --git a/workflow/engine/classes/model/Event.php b/workflow/engine/classes/model/Event.php
index fa469059e..f3932d91a 100755
--- a/workflow/engine/classes/model/Event.php
+++ b/workflow/engine/classes/model/Event.php
@@ -104,7 +104,9 @@ class Event extends BaseEvent
             $aData['EVN_UID'] = G::generateUniqueID();
         }
 
-        $aData["EVN_DESCRIPTION"] = str_replace("__AMP__", "&", $aData["EVN_DESCRIPTION"]);
+        if (isset($aData["EVN_DESCRIPTION"])) {
+            $aData["EVN_DESCRIPTION"] = str_replace("AMP", "&", $aData["EVN_DESCRIPTION"]);
+        }
 
         $oConnection = Propel::getConnection( EventPeer::DATABASE_NAME );
         try {
diff --git a/workflow/engine/js/events/events.js b/workflow/engine/js/events/events.js
index 99a68e84d..492ade396 100755
--- a/workflow/engine/js/events/events.js
+++ b/workflow/engine/js/events/events.js
@@ -14,7 +14,7 @@ var eventsNewAction = function(oForm) {
       url   : '../events/eventsNewAction',
       method: 'POST',
       args  : 'PRO_UID=' + getField('PRO_UID').value
-            + "&EVN_DESCRIPTION=" + stringReplace("\\&", "__AMP__", getField("EVN_DESCRIPTION").value)
+            + "&EVN_DESCRIPTION=" + stringReplace("\\&", "AMP", getField("EVN_DESCRIPTION").value)
             + '&EVN_STATUS=' + getField('EVN_STATUS').value
             + '&EVN_WHEN=' + getField('EVN_WHEN').value
             + '&EVN_WHEN_OCCURS=' + getField('EVN_WHEN_OCCURS').value