diff --git a/system/functions.php b/system/functions.php
index 338fbe2d..79095c08 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -1265,7 +1265,7 @@ function getCustomPage($page, &$success)
 }
 
 function escapeHtml($html) {
-	return htmlentities($html, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+	return htmlspecialchars($html);
 }
 
 function displayErrorBoxWithBackButton($errors, $action = null) {
diff --git a/system/pages/creatures.php b/system/pages/creatures.php
index e8916ca1..7113f64b 100644
--- a/system/pages/creatures.php
+++ b/system/pages/creatures.php
@@ -157,7 +157,7 @@ if (empty($_REQUEST['creature'])) {
 		echo '</td></tr>';
 		echo '</TABLE>';
 	} else {
-		echo "Monster with name <b>" . $monster_name . "</b> doesn't exist.";
+		echo "Monster with name <b>" . htmlspecialchars($monster_name) . "</b> doesn't exist.";
 	}
 
 //back button