diff --git a/checkin_notes b/checkin_notes
index 7d13c6d3d3..ed2de824ac 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12871,6 +12871,7 @@ David  May 31 2004
         (Really Simple Syndication), described here:
         http://blogs.law.harvard.edu/tech/rss
         All projects now offer news feed at rss_main.php
+        This code courtesy of Jens Seidler.
     - SETI@home public site: made front page cached
     - added index on profile.uotd_time
 
diff --git a/html/inc/forum.inc b/html/inc/forum.inc
index 7f0757ba5a..edfeedb6e9 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -443,18 +443,18 @@ function show_forum_title($forum=NULL, $thread=NULL, $helpdesk=false) {
     } else if ($forum && !$thread) {
         echo "<span class=title>";
         if ($helpdesk) {
-            echo "<a href=help_desk.php>", " Questions and problems</a> : ";
+            echo "<a href=forum_help_desk.php>", " Questions and problems</a> : ";
         } else {
-            echo "<a href=index.php>", " Message boards</a> : ";
+            echo "<a href=forum_index.php>", " Message boards</a> : ";
         }
         echo $forum->title;
         echo "</span><br>";
     } else if ($forum && $thread) {
         echo "<span class=title>";
         if ($helpdesk) {
-            echo "<a href=help_desk.php>", " Questions and problems</a> : ";
+            echo "<a href=forum_help_desk.php>", " Questions and problems</a> : ";
         } else {
-            echo "<a href=index.php>", " Message boards</a> : ";
+            echo "<a href=forum_index.php>", " Message boards</a> : ";
         }
         echo "<a href=forum_forum.php?id=$forum->id>", $forum->title, "</a> : ";
         echo strip_tags(stripslashes($thread->title));
@@ -473,7 +473,7 @@ function show_thread($thread, $n) {
     $first_post = getFirstPost($thread->id);
     $title = stripslashes($thread->title);
     $where = $category->is_helpdesk?"Questions and answers":"Message boards";
-    $top_url = $category->is_helpdesk?"forum_help_desk.php":"index.php";
+    $top_url = $category->is_helpdesk?"forum_help_desk.php":"forum_index.php";
     $excerpt = sub_sentence(stripslashes($first_post->content), ' ', EXCERPT_LENGTH, true);
     $posted = time_diff_str($thread->create_time, time());
     $last = time_diff_str($thread->timestamp, time());
@@ -503,7 +503,7 @@ function show_post2($post, $n) {
     $forum = getForum($thread->forum);
     $category = getCategory($forum->category);
     $where = $category->is_helpdesk?"Questions and answers":"Message boards";
-    $top_url = $category->is_helpdesk?"help_desk.php":"index.php";
+    $top_url = $category->is_helpdesk?"forum_help_desk.php":"forum_index.php";
     $content = nl2br(stripslashes($post->content));
     $when = time_diff_str($post->timestamp, time());
     $user = lookup_user_id($post->user);