diff --git a/phpmyfaq/admin/record.questions.php b/phpmyfaq/admin/record.questions.php
index 2e15fd0983..0e8dbfca93 100644
--- a/phpmyfaq/admin/record.questions.php
+++ b/phpmyfaq/admin/record.questions.php
@@ -89,12 +89,14 @@
                     <td>
                         <?= $date->format(Date::createIsoDate($openQuestion->getCreated())) ?>
                       <br>
-                      <a href="mailto:<?= $openQuestion->getEmail() ?>">
+                      <a href="mailto:<?= Strings::htmlentities($openQuestion->getEmail()) ?>">
                           <?= Strings::htmlentities($openQuestion->getUsername()) ?>
                       </a>
                     </td>
                     <td>
-                      <strong><?= $category->categoryName[$openQuestion->getCategoryId()]['name'] ?></strong>
+                      <strong>
+                          <?= Strings::htmlentities($category->categoryName[$openQuestion->getCategoryId()]['name']) ?>
+                      </strong>
                       <br>
                         <?= Strings::htmlentities($openQuestion->getQuestion()) ?>
                     </td>