diff --git a/phpBB/index.php b/phpBB/index.php
index 79c0a9644b..4c297e1a8e 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -107,6 +107,7 @@ if($total_categories)
 	{
 		$template->assign_block_vars("catrow", array("CAT_ID" => $category_rows[$i]["cat_id"],
 			"PHP_SELF" => $PHP_SELF,
+			"POST_FORUM_URL" => POST_FORUM_URL,
 			"CAT_DESC" => stripslashes($category_rows[$i]["cat_title"])));
 		
 		for($j = 0; $j < $total_forums; $j++)
diff --git a/phpBB/login.php b/phpBB/login.php
index 789a9f8e04..1e8925fc21 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -24,6 +24,15 @@
 include('extension.inc');
 include('common.'.$phpEx);
 
+//
+// Set page ID for session management
+//
+$userdata = session_pagestart($user_ip, PAGE_LOGIN, $session_length);
+init_userprefs($userdata);
+//
+// End session management
+//
+
 if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit']))
 {
 	if($HTTP_POST_VARS['submit'] == "Login" && !$userdata['session_logged_in'])
@@ -69,7 +78,7 @@ if(isset($HTTP_POST_VARS['submit']) || isset($HTTP_GET_VARS['submit']))
 	{
 		if($userdata['session_logged_in'])
 		{
-			session_end($db, $userdata["session_id"], $userdata["user_id"]);
+			session_end($userdata["session_id"], $userdata["user_id"]);
 		}
 		header("Location: index.$phpEx");
 	}
diff --git a/phpBB/templates/Default/index_body.tpl b/phpBB/templates/Default/index_body.tpl
index 0891525721..d110ec2ee6 100644
--- a/phpBB/templates/Default/index_body.tpl
+++ b/phpBB/templates/Default/index_body.tpl
@@ -19,7 +19,7 @@
 	        <!-- BEGIN forumrow -->
 	        <tr bgcolor="{catrow.forumrow.ROW_COLOR}" class="tablebody">
 	          <td width="5%" align="center" valign="middle">{catrow.forumrow.FOLDER}</td>
-            <td><a href="viewforum.{PHPEX}?forum_id={catrow.forumrow.FORUM_ID}&{catrow.forumrow.POSTS}">{catrow.forumrow.FORUM_NAME}</a><br>{catrow.forumrow.FORUM_DESC}</td>
+            <td><a href="viewforum.{PHPEX}?{catrow.POST_FORUM_URL}={catrow.forumrow.FORUM_ID}&{catrow.forumrow.POSTS}">{catrow.forumrow.FORUM_NAME}</a><br>{catrow.forumrow.FORUM_DESC}</td>
             <td width="5%" align="center" valign="middle">{catrow.forumrow.TOPICS}</td>
 	          <td width="5%" align="center" valign="middle">{catrow.forumrow.POSTS}</td>
 	          <td width="15%" align="center" valign="middle">{catrow.forumrow.LAST_POST}</td>