diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 9620b524ba..be52d10c45 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -98,7 +98,7 @@ switch($pagetype)
    $jumpbox = make_jumpbox($db);
    $template->assign_vars(array("JUMPBOX_LIST" => $jumpbox,
 			    "JUMPBOX_ACTION" => "viewforum.".$phpEx,
-			    "SELECT_NAME" => "forum_id"));
+			    "SELECT_NAME" => POST_FORUM_URL));
    
    $template->assign_var_from_handle("JUMPBOX", "jumpbox");
    
@@ -116,14 +116,15 @@ switch($pagetype)
    $jumpbox = make_jumpbox($db);
    $template->assign_vars(array("JUMPBOX_LIST" => $jumpbox,
 			    "JUMPBOX_ACTION" => "viewforum.".$phpEx,
-			    "SELECT_NAME" => "forum_id"));
+			    "SELECT_NAME" => POST_FORUM_URL));
    
    $template->assign_var_from_handle("JUMPBOX", "jumpbox");
    
    $template->assign_vars(array("FORUM_ID" => $forum_id,
 			    "FORUM_NAME" => $forum_name,
 			    "TOPIC_ID" => $topic_id,
-			    "TOPIC_TITLE" => $topic_title));
+			    "TOPIC_TITLE" => $topic_title,
+				"POST_FORUM_URL" => POST_FORUM_URL));
    $template->pparse("header");
    break;
 
diff --git a/phpBB/templates/Default/viewtopic_header.tpl b/phpBB/templates/Default/viewtopic_header.tpl
index a6e2b3f244..c524d8e746 100644
--- a/phpBB/templates/Default/viewtopic_header.tpl
+++ b/phpBB/templates/Default/viewtopic_header.tpl
@@ -9,7 +9,7 @@
 	        <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
 	          <tr>                                
 	            <td align="left" valign="bottom" style="{font-size: 8pt; height: 55px;}" nowrap>
-	            <a href="index.{PHPEX}">{SITENAME} - Forum Index</a> >> <a href="viewforum.{PHPEX}?forum_id={FORUM_ID}">{FORUM_NAME}</a> >> {TOPIC_TITLE}
+	            <a href="index.{PHPEX}">{SITENAME} - Forum Index</a> >> <a href="viewforum.{PHPEX}?{POST_FORUM_URL}={FORUM_ID}">{FORUM_NAME}</a> >> {TOPIC_TITLE}
 	            </td>                             
 	          </tr>                               
 	        </table>