diff --git a/workflow/engine/methods/triggers/triggers_WizardSave.php b/workflow/engine/methods/triggers/triggers_WizardSave.php
index 4bcaf89fe..5018bc8eb 100755
--- a/workflow/engine/methods/triggers/triggers_WizardSave.php
+++ b/workflow/engine/methods/triggers/triggers_WizardSave.php
@@ -64,7 +64,8 @@ foreach ( $aInfoFunction as $k => $v ) {
 			if ((strstr ( $aDataTriggers [$sOptionTrigger], "@@" ))) {
 				$option = trim($aDataTriggers [$sOptionTrigger]);
 			} else {
-				$option = "'" . trim($aDataTriggers [$sOptionTrigger]) . "'";
+        $aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
+        $option = "'" . trim($aDataTriggers [$sOptionTrigger]) . "'";
 			}
 		} else {
 			$option = "''";
diff --git a/workflow/engine/templates/triggers/triggers_EditWizard.php b/workflow/engine/templates/triggers/triggers_EditWizard.php
index a47f8cfa0..5bfbdf80d 100644
--- a/workflow/engine/templates/triggers/triggers_EditWizard.php
+++ b/workflow/engine/templates/triggers/triggers_EditWizard.php
@@ -117,7 +117,8 @@ try {
 				$tri_Button = "<input type='button' name='INSERT_VARIABLE' value='@@' onclick='showDynaformsFormVars($sNameTag ,   \"../controls/varsAjax\" ,   \"$sProUid\" ,   \"@@\");return;' >";
 				$template->assign ( 'ADD_TRI_VARIABLE', $tri_Button );
 //				$template->assign ( 'ADD_TRI_VALUE', str_replace ( "'", "", str_replace ( '"', '', $paramDefaultValue ) ) );
-				$template->assign ( 'ADD_TRI_VALUE',  $_GET[trim( str_replace( "$", "", $paramName ) )] );
+        $paramValue = $_GET[trim( str_replace( "$", "", $paramName ) )];
+        $template->assign ( 'ADD_TRI_VALUE', str_replace("\'", "&apos;", $paramValue) );
 				$fieldDescription = ($paramDescription!="")?$paramDescription . "<br>":"";
 				$fieldDescription .= $paramDefaultValue != "" ? $paramDefaultValue . " | " . $paramType : G::LoadTranslation ( "ID_REQUIRED_FIELD" ) . " | " . $paramType;
 				$template->assign ( 'ADD_TRI_DESCRIPTION', $fieldDescription );