diff --git a/phpBB/templates/Default/viewforum_body.tpl b/phpBB/templates/Default/viewforum_body.tpl
index d09e73daa0..44fbf7f484 100644
--- a/phpBB/templates/Default/viewforum_body.tpl
+++ b/phpBB/templates/Default/viewforum_body.tpl
@@ -14,7 +14,7 @@
 	        <!-- BEGIN topicrow -->
 	        <tr bgcolor="#DDDDDD" class="tablebody">
 	          <td width="5%" align="center" valign="middle">{FOLDER}</td>
-                  <td><a href="viewtopic.{PHPEX}?forum_id={FORUM_ID}&topic_id={TOPIC_ID}&{REPLIES}">{TOPIC_TITLE}</a></td>
+                  <td><a href="viewtopic.{PHPEX}?{POST_TOPIC_URL}={TOPIC_ID}&{REPLIES}">{TOPIC_TITLE}</a></td>
                   <td width="5%" align="center" valign="middle">{REPLIES}</td>
 	          <td width="5%" align="center" valign="middle">{VIEWS}</td>
 	          <td width="15%" align="center" valign="middle">{LAST_POST}</td>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 07e801fe32..ba63bcab54 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -104,7 +104,8 @@ if($total_topics)
 	$last_post_time = date($date_format, $topic_rowset[$x]["post_time"]);
 	$last_post_user = $topic_rowset[$x]["username"];
 	$folder_img = "<img src=\"images/folder.gif\">";
-	$template->set_var(array("FORUM_ID" => $forum_id, 
+	$template->set_var(array("FORUM_ID" => $forum_id,
+		"POST_TOPIC_URL" => POST_TOPIC_URL,
 				 "TOPIC_ID" => $topic_id,
 				 "FOLDER" => $folder_img, 
 				 "REPLIES" => $replies,