diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index f03f8f094c..2a80bee30f 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -34,34 +34,25 @@
 	}
 
 	// Return a select form element with the categories option dialog in it
-	function cat_option($cat_id='',$name='ncat_id',$notall=False,$java=False) {
+	function cat_option($cat_id='',$notall=False,$java=True) {
 		global $phpgw_info;
 		if ($java) {
 			$jselect = " onChange=\"this.form.submit();\"";
-			$name='cat_id';
-			//$jsubopen  = "<noscript>";
-			//$jsubclose = "</noscript>";
 		}
 		// Setup all and none first
-		$cats_link  = "<select name=\"".$name."\"$jselect>";
+		$cats_link  = "\n<select name=\"cat_id\"$jselect>\n";
 		if (!$notall) {
-			$cats_link .= "<option value =\"all\"";
+			$cats_link .= "<option value=\"\"";
 			if ($cat_id=="all") {
 				$cats_link .= " selected";
 			}
-			$cats_link .= ">".lang("all");
+			$cats_link .= "></option>".lang("all")."\n";
 		}
 
-		$cats_link .= "<option value =\"0\"";
-		if (!$cat_id) {
-			$cats_link .= " selected";
-		}
-		$cats_link .= ">".lang("none");
-
 		// Get global and app-specific category listings
 		$cats       = CreateObject('phpgwapi.categories');
 		$cats_link .= $cats->formated_list('select','all',$cat_id,True);
-		$cats_link .= '</select>';
+		$cats_link .= '</select>'."\n";
 		return $cats_link;
 	}
 
@@ -264,7 +255,7 @@
 			$cat_id   = $fields["cat_id"];
 		}
 
-		$cats_link    = cat_option($cat_id,'ncat_id',True);
+		$cats_link    = cat_option($cat_id,True);
 
 		if ($access == 'private') {
 			$access_check = ' checked';
diff --git a/addressbook/templates/default/add.tpl b/addressbook/templates/default/add.tpl
index bfa07ff808..ad9fc7b4f0 100644
--- a/addressbook/templates/default/add.tpl
+++ b/addressbook/templates/default/add.tpl
@@ -24,7 +24,6 @@
               <input type="hidden" name="filter" value="{filter}">
               <input type="hidden" name="query" value="{query}">
               <input type="hidden" name="start" value="{start}">
-              <input type="hidden" name="ncat_id" value="{cat_id}">
               <input type="submit" name="Cancel" value="{lang_cancel}">
               </form>
               </td>
diff --git a/addressbook/templates/default/edit.tpl b/addressbook/templates/default/edit.tpl
index 5edf0fd79c..23cdb15adc 100644
--- a/addressbook/templates/default/edit.tpl
+++ b/addressbook/templates/default/edit.tpl
@@ -1,11 +1,11 @@
 
 <!-- BEGIN edit -->
+   <input type="hidden" name="ab_id" value="{ab_id}">
    <input type="hidden" name="sort" value="{sort}">
    <input type="hidden" name="order" value="{order}">
    <input type="hidden" name="filter" value="{filter}">
    <input type="hidden" name="query" value="{query}">
    <input type="hidden" name="start" value="{start}">
-   <input type="hidden" name="cat_id" value="{cat_id}">
    <TABLE border="0" cellPadding="1" cellSpacing="1" width="95%">
       <TBODY>
        <tr>
@@ -19,7 +19,6 @@
             <input type="hidden" name="filter" value="{filter}">
             <input type="hidden" name="query" value="{query}">
             <input type="hidden" name="start" value="{start}">
-            <input type="hidden" name="ncat_id" value="{cat_id}">
             <input type="submit" name="cancel" value="{lang_cancel}"></form>
               </TD>
           <TD align="right">
@@ -30,7 +29,6 @@
             <input type="hidden" name="filter" value="{filter}">
             <input type="hidden" name="query" value="{query}">
             <input type="hidden" name="start" value="{start}">
-            <input type="hidden" name="cat_id" value="{cat_id}">
             {delete_button}
            </form>
 	      </TD>
diff --git a/addressbook/templates/default/export.tpl b/addressbook/templates/default/export.tpl
index dccc6f7ec4..cd8ac8fbdf 100644
--- a/addressbook/templates/default/export.tpl
+++ b/addressbook/templates/default/export.tpl
@@ -24,7 +24,6 @@
         <input type="hidden" name="filter" value="{filter}">
         <input type="hidden" name="query" value="{query}">
         <input type="hidden" name="start" value="{start}">
-        <input type="hidden" name="cat_id" value="{cat_id}">
         </FORM>
       </TD>
     </TR>
@@ -36,7 +35,6 @@
         <input type="hidden" name="filter" value="{filter}">
         <input type="hidden" name="query" value="{query}">
         <input type="hidden" name="start" value="{start}">
-        <input type="hidden" name="ncat_id" value="{cat_id}">
         <INPUT type="submit" name="Cancel" value="{lang_cancel}">
         </FORM>
       </TD>
diff --git a/addressbook/templates/default/footer.tpl b/addressbook/templates/default/footer.tpl
index 320c25cdd3..ba068e15af 100644
--- a/addressbook/templates/default/footer.tpl
+++ b/addressbook/templates/default/footer.tpl
@@ -9,7 +9,6 @@
          <input type="hidden" name="order" value="{order}">
          <input type="hidden" name="filter" value="{filter}">
          <input type="hidden" name="start" value="{start}">
-         <input type="hidden" name="cat_id" value="{cat_id}">
         <input type="submit" name="Add" value="{lang_add}">
        </div>
      </td>
@@ -20,7 +19,6 @@
          <input type="hidden" name="order" value="{order}">
          <input type="hidden" name="filter" value="{filter}">
          <input type="hidden" name="start" value="{start}">
-         <input type="hidden" name="cat_id" value="{cat_id}">
         <input type="submit" name="AddVcard" value="{lang_addvcard}">
        </div>
      </td>
@@ -36,7 +34,6 @@
          <input type="hidden" name="order" value="{order}">
          <input type="hidden" name="filter" value="{filter}">
          <input type="hidden" name="start" value="{start}">
-         <input type="hidden" name="cat_id" value="{cat_id}">
          <input type="submit" name="Import" value="{lang_import}">
          </form>
        </div>
@@ -48,7 +45,6 @@
          <input type="hidden" name="order" value="{order}">
          <input type="hidden" name="filter" value="{filter}">
          <input type="hidden" name="start" value="{start}">
-         <input type="hidden" name="cat_id" value="{cat_id}">
          <input type="submit" name="Export" value="{lang_export}">
          </form>
        </div>
diff --git a/addressbook/templates/default/header.tpl b/addressbook/templates/default/header.tpl
index fca9dad20d..011a510346 100644
--- a/addressbook/templates/default/header.tpl
+++ b/addressbook/templates/default/header.tpl
@@ -5,13 +5,12 @@
 <br>{searchreturn}
   <form action="{cats_url}" method="POST">
 {cats}{cats_link}
-    <input type="hidden" name="cat_id" value="{cat_id}">
     <input type="hidden" name="sort" value="{sort}">
     <input type="hidden" name="order" value="{order}">
     <input type="hidden" name="filter" value="{filter}">
     <input type="hidden" name="query" value="{query}">
     <input type="hidden" name="start" value="{start}">
-    <input type="submit" name="cats" value="{lang_cats}">
+    <noscript><input type="submit" name="cats" value="{lang_cats}"></noscript>
   </form>
 {search_filter}
 
diff --git a/addressbook/templates/default/import.tpl b/addressbook/templates/default/import.tpl
index 6b55a5a894..d0f20ca4c5 100644
--- a/addressbook/templates/default/import.tpl
+++ b/addressbook/templates/default/import.tpl
@@ -37,7 +37,6 @@
               <input type="hidden" name="filter" value="{filter}">
               <input type="hidden" name="query" value="{query}">
               <input type="hidden" name="start" value="{start}">
-              <input type="hidden" name="cat_id" value="{cat_id}">
             </FORM></TD>
           </TR>
         </TABLE>
@@ -52,7 +51,6 @@
         <input type="hidden" name="filter" value="{filter}">
         <input type="hidden" name="query" value="{query}">
         <input type="hidden" name="start" value="{start}">
-        <input type="hidden" name="ncat_id" value="{cat_id}">
         <input type="submit" name="Cancel" value="{lang_cancel}">
 	    </form>
        </div>
diff --git a/addressbook/templates/default/view.tpl b/addressbook/templates/default/view.tpl
index 2152d1433e..9f138d8c38 100644
--- a/addressbook/templates/default/view.tpl
+++ b/addressbook/templates/default/view.tpl
@@ -22,7 +22,6 @@
      <input type="hidden" name="filter" value="{filter}">
      <input type="hidden" name="start" value="{start}">
      <input type="hidden" name="fields" value="{copy_fields}">
-     <input type="hidden" name="cat_id" value="{cat_id}">
      <input type="submit" name="submit" value="{lang_copy}">
     </form>
    </TD>
@@ -33,7 +32,6 @@
      <input type="hidden" name="order" value="{order}">
      <input type="hidden" name="filter" value="{filter}">
      <input type="hidden" name="start" value="{start}">
-     <input type="hidden" name="cat_id" value="{cat_id}">
      <input type="submit" name="VCardform" value="{lang_vcard}">
     </form>
    </TD>
@@ -43,7 +41,6 @@
      <input type="hidden" name="order" value="{order}">
      <input type="hidden" name="filter" value="{filter}">
      <input type="hidden" name="start" value="{start}">
-     <input type="hidden" name="ncat_id" value="{cat_id}">
      <input type="submit" name="Doneform" value="{lang_done}">
     </form>
    </TD>