diff --git a/mozilla/webtools/update/core/inc_global.php b/mozilla/webtools/update/core/inc_global.php
index 5b96f34f9d7..1e9f456c4f8 100644
--- a/mozilla/webtools/update/core/inc_global.php
+++ b/mozilla/webtools/update/core/inc_global.php
@@ -145,13 +145,13 @@ function checkFormKey()
 // -----------------------------
 
 function uriparams() {
-    global $app_version, $application, $items_per_page, $category, $OS;
+    global $app_version, $application, $items_per_page, $category, $OS, $uriparams_skip;
     $uriparams = "";
 
-    if ($application) { $uriparams .="application=$application"; }
+    if ($application and $uriparams_skip !="application") { $uriparams .="application=$application"; }
     if ($app_version) { $uriparams .="&version=$app_version"; }
     if ($OS) { $uriparams .="&os=$OS"; }
-    if ($category) { $uriparams .="&category=$category"; }
+    if ($category and $uriparams_skip !="category") { $uriparams .="&category=$category"; }
     if ($items_per_page) { $uriparams .="&numpg=$items_per_page"; }
 
     return $uriparams;
diff --git a/mozilla/webtools/update/core/inc_header.php b/mozilla/webtools/update/core/inc_header.php
index b942cc60ffd..9a9134193d7 100644
--- a/mozilla/webtools/update/core/inc_header.php
+++ b/mozilla/webtools/update/core/inc_header.php
@@ -76,26 +76,13 @@
  </div>
  </form>
 </div>
-Firefox: <a href="/extensions/?application=firefox">Extensions</a> <a href="/themes/?application=firefox">Themes</a> <a href="/searchplugins/">Search Plugins</a> | 
-Thunderbird: <a href="/extensions/?application=thunderbird">Extensions</a> <a href="/themes/?application=thunderbird">Themes</a> | 
-Mozilla Suite: <a href="/extensions/?application=mozilla">Extensions</a> <a href="/themes/?application=mozilla">Themes</a>
-<!-- closes #header-->
-<?php return; ?>
-
-
-
-
-<DIV class="header">
 <?php
-if ($pos !== false) {
+$uriparams_skip="application";
 ?>
-<?php if ($_SESSION["logoncheck"] =="YES" && $headerline !="none") { ?>
-<DIV class="adminheading">
-Welcome<?php echo" $_SESSION[name]"; ?>!
-<a href="usermanager.php?function=edituser&amp;userid=<?php echo"$_SESSION[uid]"; ?>">Your Profile</a> | <A HREF="main.php">Home</A> |<A HREF="logout.php">Logout</A>
-<?php } ?>
-</DIV>
-<div id="mainContent">
+Firefox: <a href="/extensions/?<?php echo"".uriparams()."&"; ?>application=firefox">Extensions</a> <a href="/themes/?<?php echo"".uriparams()."&"; ?>application=firefox">Themes</a> <a href="/searchplugins/">Search Plugins</a> | 
+Thunderbird: <a href="/extensions/?<?php echo"".uriparams()."&"; ?>application=thunderbird">Extensions</a> <a href="/themes/?<?php echo"".uriparams()."&"; ?>application=thunderbird">Themes</a> | 
+Mozilla Suite: <a href="/extensions/?<?php echo"".uriparams()."&"; ?>application=mozilla">Extensions</a> <a href="/themes/?<?php echo"".uriparams()."&"; ?>application=mozilla">Themes</a>
 <?php
-}
-?>
\ No newline at end of file
+unset($uriparams_skip);
+?>
+<!-- closes #header-->
\ No newline at end of file
diff --git a/mozilla/webtools/update/index.php b/mozilla/webtools/update/index.php
index 594625990df..0a8c133b937 100644
--- a/mozilla/webtools/update/index.php
+++ b/mozilla/webtools/update/index.php
@@ -61,7 +61,7 @@ include"$page_header";
 
 <div id="mBody">
   <div class="frontcolumn">
-    <h2><a href="extensions/?application=<?php echo"$application"; ?>">Get Extensions</a></h2>
+    <h2><a href="extensions/?<?php echo"".uriparams().""; ?>">Get Extensions</a></h2>
     <a href="products/thunderbird"><img src="images/product-front-thunderbird.png" alt="Thunderbird" class="promo" width="60" height="60"></a>
     <p>Extensions are small add-ons that add new functionality. They can add anything from a toolbar button to a completely new feature.</p>
 
@@ -74,10 +74,10 @@ WHERE  `Type`  =  'E' AND `AppName` = '$application' AND `minAppVer_int`<='$curr
  $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
   $numextensions = mysql_num_rows($sql_result);
 ?>
-     <a href="/extensions/?application=<?php echo"$application"; ?>">Browse extensions</a><BR>(<?php echo"$numextensions"; ?> available for <?php print(ucwords($application)); echo" $currentver_display"; ?>)<BR> 
+     <a href="/extensions/?<?php echo"".uriparams().""; ?>">Browse extensions</a><BR>(<?php echo"$numextensions"; ?> available for <?php print(ucwords($application)); echo" $currentver_display"; ?>)<BR> 
   </div>
   <div class="frontcolumn">
-    <h2><a href="themes/?application=<?php echo"$application"; ?>">Get Themes</a></h2>
+    <h2><a href="themes/?<?php echo"".uriparams().""; ?>">Get Themes</a></h2>
     <a href="products/mozilla1.x"><img src="images/product-front-mozilla.png" alt="Mozilla" class="promo" width="60" height="60"></a>
     <p>Themes are skins for Firefox, they allow you to change the look and feel of the browser and personalize it to your tastes.</p>
 <?php
@@ -88,7 +88,7 @@ WHERE  `Type`  =  'T' AND `AppName` = '$application' AND `minAppVer_int`<='$curr
  $sql_result = mysql_query($sql, $connection) or trigger_error("MySQL Error ".mysql_errno().": ".mysql_error()."", E_USER_NOTICE);
   $numthemes = mysql_num_rows($sql_result);
 ?>
-     <a href="/themes/?application=<?php echo"$application"; ?>">Browse themes</a><BR>(<?php echo"$numthemes"; ?> available for <?php print(ucwords($application)); echo" $currentver_display"; ?>)
+     <a href="/themes/?<?php echo"".uriparams().""; ?>">Browse themes</a><BR>(<?php echo"$numthemes"; ?> available for <?php print(ucwords($application)); echo" $currentver_display"; ?>)
   </div>
   <div class="frontcolumnlast">
     <h2><a href="http://www.MozillaStore.com">Get Plugins</a></h2>
@@ -189,7 +189,7 @@ WHERE `Type` = 'E' AND `AppName` = '$application' AND `pick`='YES' ORDER BY `rID
     $bodylength = strlen($body);
 if ($bodylength>"250") {
  $body = substr($body,0,250);
- $body .= " <a href=\"/extensions/moreinfo.php?id=$id&page=staffreview\">[More...]</a>";
+ $body .= " <a href=\"/extensions/moreinfo.php?".uriparams()."&id=$id&page=staffreview\">[More...]</a>";
  
  }
 
@@ -228,7 +228,7 @@ WHERE `Type` = 'T' AND `AppName` = '$application' AND `pick`='YES' ORDER BY `rID
     $bodylength = strlen($body);
 if ($bodylength>"250") {
  $body = substr($body,0,250);
- $body .= " <a href=\"/moreinfo.php?id=$id&page=staffreview\">[More...]</a>";
+ $body .= " <a href=\"/moreinfo.php?".uriparams()."&id=$id&page=staffreview\">[More...]</a>";
  
  }