diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 0765ad701..946830cbf 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -1815,7 +1815,8 @@ EOF
 				break;
 
 				case 'HTML':
-					$oWidget = new UIHTMLEditorWidget($iId, $oAttDef, $sNameSuffix, $sFieldPrefix, $sHelpText, $sValidationSpan.$sReloadSpan, $value, $bMandatory);
+					$sEditValue = $oAttDef->GetEditValue($value);
+					$oWidget = new UIHTMLEditorWidget($iId, $oAttDef, $sNameSuffix, $sFieldPrefix, $sHelpText, $sValidationSpan.$sReloadSpan, $sEditValue, $bMandatory);
 					$sHTMLValue = $oWidget->Display($oPage, $aArgs);
 				break;
 
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index afaec9bc7..f464715bd 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -2470,6 +2470,10 @@ class AttributeText extends AttributeString
 				}
 			}
 		}
+		else
+		{
+			$sValue = str_replace('&', '&', $sValue);
+		}
 		return $sValue;
 	}