diff --git a/doc/template/tmpl/params.tmpl b/doc/template/tmpl/params.tmpl
index 1ddd6e67cf..b9ab2019d5 100644
--- a/doc/template/tmpl/params.tmpl
+++ b/doc/template/tmpl/params.tmpl
@@ -64,7 +64,7 @@
 	
         <tr>
             <?js if (params.hasName) {?>
-                <td class="name"><code><?js= param.name ?></code></td>
+                <td class="name"><code><?js= param.name.replace(/^opt_/, "") ?></code></td>
             <?js } ?>
             
             <td class="type">
@@ -81,7 +81,7 @@
                 </td>
             <?js } ?>
             
-            <td class="description last"><?js= param.description ?><?js if (param.subparams) { ?>
+            <td class="description last"><?js= (param.optional ? "(Optional) " : "") + param.description ?><?js if (param.subparams) { ?>
                 <h6>Properties</h6>
                 <?js= self.partial('params.tmpl', param.subparams) ?>
             <?js } ?></td>