diff --git a/drupal/sites/default/boinc/themes/boinc/templates/forum-list.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/forum-list.tpl.php
index 685cf11b28..454b98d8c6 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/forum-list.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/forum-list.tpl.php
@@ -51,7 +51,7 @@
                  * left-margin for indenting.
                  */ ?>
           <?php print str_repeat('<div class="indent">', $forum->depth); ?>
-            <div class="name"><a href="<?php print $forum->link; ?>"><?php print $forum->name; ?></a></div>
+            <div class="name"><?php print l($forum->name, "community/forum/{$forum->tid}", array('html' => TRUE)); ?></div>
             <?php if ($forum->description): ?>
               <div class="description"><?php print $forum->description; ?></div>
             <?php endif; ?>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/forum-topic-list.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/forum-topic-list.tpl.php
index 24c0dd2b3a..c82e27ebfb 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/forum-topic-list.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/forum-topic-list.tpl.php
@@ -49,7 +49,7 @@
   ?>
   
   <h2 class="title">
-    <?php print l($forum_vocab->name, 'forum') . ' &rsaquo; '; ?>
+    <?php print l($forum_vocab->name, 'community/forum') . ' &rsaquo; '; ?>
     <?php print $taxonomy->name; ?>
   </h2>
   
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
index bcb32be71b..6a11378543 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
@@ -91,10 +91,10 @@
       // Get vocabulary name and taxonomy name for subtitle breadcrumbs
       $taxonomy = current($node->taxonomy);
       if ($forum_vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
-        $subtitle[] = l($forum_vocab->name, 'forum');
+        $subtitle[] = l($forum_vocab->name, 'community/forum');
       }
       if (isset($taxonomy->name)) {
-        $subtitle[] = l($taxonomy->name, "forum/{$taxonomy->tid}");
+        $subtitle[] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
       }
       $subtitle = implode(' &rsaquo; ', $subtitle);
     }
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
index 13743d24e4..2710c3a000 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
@@ -100,7 +100,7 @@
       // Get vocabulary name and taxonomy name for subtitle breadcrumbs
       $taxonomy = taxonomy_get_term($forum_node->tid);
       if ($forum_vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
-        $subtitle[] = l($forum_vocab->name, 'forum');
+        $subtitle[] = l($forum_vocab->name, 'community/forum');
       }
       if ($team_forum) {
         $subtitle[] = l($team_forum->title, "community/teams/{$team_forum->nid}/forum/{$team_forum->tfid}");
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/views-view--boinc-team-forum-topics.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/views-view--boinc-team-forum-topics.tpl.php
index 651036b08f..16199842e7 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/views-view--boinc-team-forum-topics.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/views-view--boinc-team-forum-topics.tpl.php
@@ -76,7 +76,7 @@
       
       <div id="forum">
         <h2 class="title">
-          <?php print l($forum_vocab->name, 'forum') . ' &rsaquo; '; ?>
+          <?php print l($forum_vocab->name, 'community/forum') . ' &rsaquo; '; ?>
           <?php print $team_forum->title; ?>
         </h2>
         <?php if ($rows): ?>