diff --git a/preferences/help/index.php b/preferences/help/index.php
index 849d9a4c3b..531639de80 100755
--- a/preferences/help/index.php
+++ b/preferences/help/index.php
@@ -16,10 +16,11 @@
 	);
 	$phpgw_info['flags'] = $phpgw_flags;
 	include('../../header.inc.php');
+	$appname = 'preferences';
+	include(PHPGW_SERVER_ROOT.'/'.$appname.'/version.inc.php');
 ?>
-<img src="<?php echo $phpgw->common->image('preferences','navbar.gif'); ?>" border="0">
-<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2"><p/>
-<?php include(PHPGW_SERVER_ROOT.'/preferences/version.inc.php'); ?>
-Version: <b><?php echo $phpgw_info['server']['versions']['preferences']; ?></b>
+<img src="<?php echo $phpgw->common->image($appname,'navbar.gif'); ?>" border="0"><p/>
+<font face="<?php echo $phpgw_info['theme']['font']; ?>" size="2">
+Version: <b><?php echo $phpgw_info['server']['versions'][$appname]; ?></b>
 </font>
 <?php $phpgw->common->phpgw_footer(); ?>
diff --git a/preferences/inc/hook_manual.inc.php b/preferences/inc/hook_manual.inc.php
index 75a18a3df6..ae1c2b768a 100755
--- a/preferences/inc/hook_manual.inc.php
+++ b/preferences/inc/hook_manual.inc.php
@@ -22,6 +22,6 @@
 	$treemenu[] = '..'.($navbar != 'text'?'<img src="'.$phpgw->common->image($appname,'navbar.gif').'" border="0" alt="'.ucwords($appname).'">':'').($navbar != 'icons'?'<font face="'.$font.'">'.ucwords($appname).'</font>':'').'|'.$phpgw->link('/'.$appname.'/help/index.php');
 	$treemenu[] = '...<font face="'.$font.'">Overview</font>|'.$phpgw->link('/'.$appname.'/help/'.$appname.'.php');
 // Modify the $treemenu variables from here down.....
-	$treemenu[] = '...<font face="'.$font.'">Settings</font>|/'.$appname.'/help/settings.php'."\n";
-	$treemenu[] = '...<font face="'.$phpgw_info['theme']['font'].'">Other</font>|/'.$appname.'/help/other.php'."\n";
+	$treemenu[] = '...<font face="'.$font.'">Settings</font>|'.$phpgw->link('/'.$appname.'/help/settings.php');
+	$treemenu[] = '...<font face="'.$font.'">Other</font>|'.$phpgw->link('/'.$appname.'/help/other.php');
 ?>