diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index a42684398..c2fc0c93a 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -762,7 +762,7 @@ function getOptionHelpHTML($optionHelpIndex, $OLANG) {
   if ( !empty($OLANG[$optionHelpIndex]) ) {
     $optionHelpText = $OLANG[$optionHelpIndex]['Help'];
   } else {
-    $optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($ZMoptionHelpIndex));
+    $optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($optionHelpIndex));
   }
   $optionHelpText = validHtmlStr($optionHelpText);
   $optionHelpText = preg_replace('/~~/', '<br/>', $optionHelpText );
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index acceff327..0fb5cb6e4 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -512,7 +512,7 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
 <?php
         }
 ?>
-              <span class="form-text form-control-sm"><?php echo validHtmlStr($optionPromptText) ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option='.$name, 'zmOptionHelp', 'optionhelp', '?' ) ?>)</span>
+              <span class="form-text form-control-sm"><?php echo validHtmlStr($optionPromptText); echo makeHelpLink($name) ?></span>
 	    </div><!-- End .col-sm-9 -->
             </div><!-- End .form-group -->
 <?php