diff --git a/event/listener.php b/event/listener.php
index 9d1098e..61096c3 100644
--- a/event/listener.php
+++ b/event/listener.php
@@ -368,8 +368,8 @@ protected function can_use_notifications()
 	 */
 	protected function trim_shortname($name)
 	{
-		$decoded = ext::decode_entities($name, ENT_QUOTES);
+		$decoded = ext::decode_entities($name, ENT_COMPAT);
 		$trimmed = utf8_substr($decoded, 0, 12);
-		return htmlspecialchars($trimmed, ENT_QUOTES, 'UTF-8');
+		return utf8_htmlspecialchars($trimmed);
 	}
 }