diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 2c8ef4fea..b5758307d 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -335,7 +335,7 @@ EOF
 	          $i = 0;
 			  foreach($m_aTabs as $sTabName => $sTabContent)
 			  {
-			      $sTabs .= "<li><a href=\"#fragment_$i\" class=\"tab\"><span>".htmlentities($sTabName)."</span></a></li>\n";
+			      $sTabs .= "<li><a href=\"#fragment_$i\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
 			      $i++;
 	          }
 			  $sTabs .= "</ul>\n";
diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index ae1ab935f..26e729e93 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -59,7 +59,7 @@ class NiceWebPage extends WebPage
 		foreach($aChoices as $sKey => $sValue)
 		{
 			$sSelected = ($sKey == $sDefaultValue) ? " SELECTED" : "";
-			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"".htmlspecialchars($sKey)."\"$sSelected>".htmlentities($sValue)."</option>");
+			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"".htmlspecialchars($sKey)."\"$sSelected>".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."</option>");
 		}
 		$this->add("</select>");
 	}
diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php
index c063a9bd1..7b001124a 100644
--- a/core/bulkchange.class.inc.php
+++ b/core/bulkchange.class.inc.php
@@ -47,7 +47,7 @@ abstract class CellChangeSpec
 		}
 		else
 		{
-			return htmlentities($value);
+			return htmlentities($value, ENT_QUOTES, 'UTF-8');
 		}
 	}