diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index 3291db901d..305fbf1e68 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -292,8 +292,12 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR
 
 	$jumpbox = make_jumpbox();
 	$template->assign_vars(array(
-		"JUMPBOX_LIST" => $jumpbox,
-		"SELECT_NAME" => POST_FORUM_URL)
+		"L_GO" => $lang['Go'],
+		"L_JUMP_TO" => $lang['Jump_to'],
+		"L_SELECT_FORUM" => $lang['Select_forum'],
+		
+		"S_JUMPBOX_LIST" => $jumpbox,
+		"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 	);
 	$template->assign_var_from_handle("JUMPBOX", "jumpbox");
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4642446a21..527bb81017 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -150,12 +150,12 @@ function make_jumpbox()
 
 //		$is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata);
 
-		$boxstring = '<option value="-1">' . $lang['Select_forum'] . '</option>';
+		$boxstring = '<select name="' . POST_FORUM_URL . '"><option value="-1">' . $lang['Select_forum'] . '</option>';
 		for($i = 0; $i < $total_categories; $i++)
 		{
-			$boxstring .= "<option value=\"-1\">&nbsp;</option>\n";
-			$boxstring .= "<option value=\"-1\">" . stripslashes($category_rows[$i]['cat_title']) . "</option>\n";
-			$boxstring .= "<option value=\"-1\">----------------</option>\n";
+			$boxstring .= '<option value="-1">&nbsp;</option>';
+			$boxstring .= '<option value="-1">' . $category_rows[$i]['cat_title'] . '</option>';
+			$boxstring .= '<option value="-1">----------------</option>';
 
 			if($total_forums)
 			{
@@ -163,19 +163,20 @@ function make_jumpbox()
 				{
 					if(  $forum_rows[$y]['cat_id'] == $category_rows[$i]['cat_id'] )
 					{
-						$boxstring .=  "<option value=\"" . $forum_rows[$y]['forum_id'] . "\">" . stripslashes($forum_rows[$y]['forum_name']) . "</option>\n";
+						$boxstring .=  '<option value="' . $forum_rows[$y]['forum_id'] . '">' . $forum_rows[$y]['forum_name'] . '</option>';
 					}
 				}
 			}
 			else
 			{
-				$boxstring .= "<option value=\"-1\">-- ! No Forums ! --</option>\n";
+				$boxstring .= '<option value="-1">-- ! No Forums ! --</option>';
 			}
 		}
+		$boxstring .= '</select>';
 	}
 	else
 	{
-		$boxstring .= "<option value=\"-1\">-- ! No Categories ! --</option>\n";
+		$boxstring .= '<select><option value="-1">-- ! No Categories ! --</option></select>';
 	}
 
 	return($boxstring);
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 317bdbb37d..c00f27df86 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -140,8 +140,9 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 		"L_GO" => $lang['Go'],
 		"L_JUMP_TO" => $lang['Jump_to'],
 		"L_SELECT_FORUM" => $lang['Select_forum'],
-		"JUMPBOX_LIST" => $jumpbox,
-		"SELECT_NAME" => POST_FORUM_URL)
+		
+		"S_JUMPBOX_LIST" => $jumpbox,
+		"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 	);
 	$template->assign_var_from_handle("JUMPBOX", "jumpbox");
 
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 7131b3c2c1..20c23632b1 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1767,9 +1767,9 @@ $template->assign_vars(array(
 	"L_GO" => $lang['Go'],
 	"L_JUMP_TO" => $lang['Jump_to'],
 	"L_SELECT_FORUM" => $lang['Select_forum'],
-
-	"JUMPBOX_LIST" => $jumpbox,
-	"SELECT_NAME" => POST_FORUM_URL)
+	
+	"S_JUMPBOX_LIST" => $jumpbox,
+	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 );
 $template->assign_var_from_handle("JUMPBOX", "jumpbox");
 
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 7b45f1ad03..212d342142 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -61,8 +61,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"L_GO" => $lang['Go'],
 			"L_JUMP_TO" => $lang['Jump_to'],
 			"L_SELECT_FORUM" => $lang['Select_forum'],
-			"JUMPBOX_LIST" => $jumpbox,
-			"SELECT_NAME" => POST_FORUM_URL)
+			
+			"S_JUMPBOX_LIST" => $jumpbox,
+			"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 		);
 		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
 
@@ -222,8 +223,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 					"L_GO" => $lang['Go'],
 					"L_JUMP_TO" => $lang['Jump_to'],
 					"L_SELECT_FORUM" => $lang['Select_forum'],
-					"JUMPBOX_LIST" => $jumpbox,
-					"SELECT_NAME" => POST_FORUM_URL)
+					
+					"S_JUMPBOX_LIST" => $jumpbox,
+					"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 				);
 				$template->assign_var_from_handle("JUMPBOX", "jumpbox");
 
@@ -896,8 +898,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"L_GO" => $lang['Go'],
 			"L_JUMP_TO" => $lang['Jump_to'],
 			"L_SELECT_FORUM" => $lang['Select_forum'],
-			"JUMPBOX_LIST" => $jumpbox,
-			"SELECT_NAME" => POST_FORUM_URL)
+			
+			"S_JUMPBOX_LIST" => $jumpbox,
+			"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 		);
 		$template->assign_var_from_handle("JUMPBOX", "jumpbox");
 
diff --git a/phpBB/templates/PSO/jumpbox.tpl b/phpBB/templates/PSO/jumpbox.tpl
index a4885dc371..36bd5206d8 100644
--- a/phpBB/templates/PSO/jumpbox.tpl
+++ b/phpBB/templates/PSO/jumpbox.tpl
@@ -1,6 +1,6 @@
 
 <form method="post" action="{S_JUMPBOX_ACTION}"><table cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;<select name="{SELECT_NAME}">{JUMPBOX_LIST}</select>&nbsp;<input type="submit" value="{L_GO}" /></span></td>
+		<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp;<input type="submit" value="{L_GO}" /></span></td>
 	</tr>
 </table></form>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index b718d2ec74..a9e4cf863d 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -322,8 +322,9 @@ $template->assign_vars(array(
 	"L_GO" => $lang['Go'],
 	"L_JUMP_TO" => $lang['Jump_to'],
 	"L_SELECT_FORUM" => $lang['Select_forum'],
-	"JUMPBOX_LIST" => $jumpbox,
-    "SELECT_NAME" => POST_FORUM_URL)
+	
+	"S_JUMPBOX_LIST" => $jumpbox,
+	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 );
 $template->assign_var_from_handle("JUMPBOX", "jumpbox");
 
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index e04196dc89..7e220e5cb7 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -50,8 +50,9 @@ $template->assign_vars(array(
 	"L_GO" => $lang['Go'],
 	"L_JUMP_TO" => $lang['Jump_to'],
 	"L_SELECT_FORUM" => $lang['Select_forum'],
-	"JUMPBOX_LIST" => $jumpbox,
-    "SELECT_NAME" => POST_FORUM_URL)
+	
+	"S_JUMPBOX_LIST" => $jumpbox,
+	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 );
 $template->assign_var_from_handle("JUMPBOX", "jumpbox");
 //
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 723b914fb2..dacd7bb926 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -385,8 +385,9 @@ $template->assign_vars(array(
 	"L_GO" => $lang['Go'],
 	"L_JUMP_TO" => $lang['Jump_to'],
 	"L_SELECT_FORUM" => $lang['Select_forum'],
-	"JUMPBOX_LIST" => $jumpbox,
-    "SELECT_NAME" => POST_FORUM_URL)
+	
+	"S_JUMPBOX_LIST" => $jumpbox,
+	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
 );
 $template->assign_var_from_handle("JUMPBOX", "jumpbox");