diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 6dd00e48c6..0dac3cad4d 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -31,6 +31,10 @@ if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_UR
 {
 	$forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]);
 }
+else if( isset($HTTP_GET_VARS['forum']))
+{
+	$forum_id = $HTTP_GET_VARS['forum'];
+}
 else
 {
 	$forum_id = "";
@@ -669,4 +673,4 @@ $template->pparse("body");
 //
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index f8d21fbbec..bc96e31d38 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -32,6 +32,11 @@ if(isset($HTTP_GET_VARS[POST_TOPIC_URL]))
 {
 	$topic_id = intval($HTTP_GET_VARS[POST_TOPIC_URL]);
 }
+else if(isset($HTTP_GET_VARS['topic']))
+{
+	$topic_id = intval($HTTP_GET_VARS['topic']);
+}
+
 if(isset($HTTP_GET_VARS[POST_POST_URL]))
 {
 	$post_id = intval($HTTP_GET_VARS[POST_POST_URL]);