diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index cb3e156d12..7ac681cf16 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -250,7 +250,7 @@
 					$s .= '>' . $phpgw->strip_html($cats[$i]['name']);
 					if ($cats[$i]['app_name'] == 'phpgw')
 					{
-					$s .=  '<' . lang('Global') . '>';
+					$s .= '<' . lang('Global') . '>';
 					}
 					$s .=  '</option>';
 				}
@@ -447,19 +447,18 @@
 
 		    if ($cat_name)
 		    {
-			$cat_exists = " AND cat_name='" . addslashes($cat_name) . "' "; 
+			$cat_exists = " cat_name='" . addslashes($cat_name) . "' "; 
 		    }
 		    if ($cat_id)
 		    {
-                        $cat_exists = " AND cat_parent='$cat_id' ";
+                        $cat_exists = " cat_parent='$cat_id' ";
 		    }
 		    if ($cat_name && $cat_id)
 		    {
-			$cat_exists = " AND cat_name='" . addslashes($cat_name) . "' AND cat_id != '$cat_id' ";
+			$cat_exists = " cat_name='" . addslashes($cat_name) . "' AND cat_id != '$cat_id' ";
 		    }
 
-                    $this->db->query("select count(*) from phpgw_categories where cat_appname='"
-                       . $this->app_name . "' $cat_exists $filter",__LINE__,__FILE__);
+                    $this->db->query("select count(*) from phpgw_categories where $cat_exists $filter",__LINE__,__FILE__);
 
 		    $this->db->next_record();