diff --git a/web/zm_html_view_optionhelp.php b/web/zm_html_view_optionhelp.php
index 67f0d1eba..aef2ee2d7 100644
--- a/web/zm_html_view_optionhelp.php
+++ b/web/zm_html_view_optionhelp.php
@@ -38,7 +38,7 @@ function closeWindow()
 <table border="0" cellspacing="0" cellpadding="4" width="96%">
 <tr><td align="right" class="text"><a href="javascript: closeWindow();"><?= $zmSlangClose ?></a></td></tr>
 <tr><td align="left" class="smallhead"><?= $option ?></td></tr>
-<tr><td class="text"><p class="text" align="justify"><?= $option_help_text ?></p></td></tr>
+<tr><td class="text"><p class="text" align="justify"><?= htmlentities($option_help_text) ?></p></td></tr>
 </table>
 </body>
 </html>
diff --git a/web/zm_html_view_options.php b/web/zm_html_view_options.php
index 5c9eb0144..962276100 100644
--- a/web/zm_html_view_options.php
+++ b/web/zm_html_view_options.php
@@ -226,7 +226,7 @@ else
 ?>
 <tr>
 <td align="left" class="text"><?= $value['Name'] ?></td>
-<td align="left" class="text"><?= $option_prompt_text ?> (<a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=optionhelp&option=<?= $value['Name'] ?>', 'zmOptionHelp', <?= $jws['optionhelp']['w'] ?>, <?= $jws['optionhelp']['h'] ?>);">?</a>)</td>
+<td align="left" class="text"><?= htmlentities($option_prompt_text) ?> (<a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=optionhelp&option=<?= $value['Name'] ?>', 'zmOptionHelp', <?= $jws['optionhelp']['w'] ?>, <?= $jws['optionhelp']['h'] ?>);">?</a>)</td>
 <?php	
 		if ( $value['Type'] == "boolean" )
 		{