diff --git a/help.php b/help.php
index 512db4a..fa2a843 100644
--- a/help.php
+++ b/help.php
@@ -82,10 +82,10 @@ class HelpDispatcher extends KTStandardDispatcher {
         if (!$can_edit) {
             if (!PEAR::isError($oReplacementHelp)) {
                 $this->oPage->setTitle($oReplacementHelp->getTitle());
-                return $oReplacementHelp->getDescription();
+                //return $oReplacementHelp->getDescription();
             } elseif ($aHelpInfo != false) {
                 $this->oPage->setTitle($aHelpInfo['title']);
-                return $aHelpInfo['body'];
+                //return $aHelpInfo['body'];
             } else {
                 $this->oPage->setTitle(_('Invalid help location specified.'));
                 $this->oPage->addError(_('Invalid help location specified.'));
@@ -109,6 +109,7 @@ class HelpDispatcher extends KTStandardDispatcher {
               "help_body" => $aHelpInfo['body'],
               "target_name" => $_SERVER['PATH_INFO'],
               "back_key" => $sBackKey,
+              'can_edit' => $can_edit,
         );
         return $oTemplate->render($aTemplateData);
     }
diff --git a/templates/ktcore/help_with_edit.smarty b/templates/ktcore/help_with_edit.smarty
index 6c02040..a35d8ee 100644
--- a/templates/ktcore/help_with_edit.smarty
+++ b/templates/ktcore/help_with_edit.smarty
@@ -11,9 +11,9 @@
 {/if}
 
 <hr />
-<p><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}" class="ktAction ktEdit" style="float:
-left; padding-right: 0.5em;">{i18n}Edit this help page.{/i18n}</a><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}">{i18n}Edit this help page.{/i18n}</a><br/>
+<p>{if $can_edit}<a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}" class="ktAction ktEdit" style="float:
+left; padding-right: 0.5em;">{i18n}Edit this help page.{/i18n}</a><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}">{i18n}Edit this help page.{/i18n}</a><br/>{/if}
 
 <a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}" class="ktAction ktBack" style="float:
-left; padding-right: 0.5em;">{i18n}Return to where you came from.{/i18n}</a><a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}">{i18n}Return to where you came from.{/i18n}</a></p>
+left; padding-right: 0.5em; clear: left; ">{i18n}Return to where you came from.{/i18n}</a><a href="{ktLink base="help.php" query="action=go_back&back_key=`$back_key`"}">{i18n}Return to where you came from.{/i18n}</a></p>
  
\ No newline at end of file