diff --git a/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php
index 20a2c5f39c..070458b0e9 100644
--- a/phpgwapi/inc/class.nextmatchs.inc.php
+++ b/phpgwapi/inc/class.nextmatchs.inc.php
@@ -307,15 +307,15 @@
                                   array('private',lang('Only yours')));
 					for ($index=0; $index<$indexlimit; $index++)
 					{
-						$filter_obj[2+$index][0] = $user_groups[$index][0];
-						$filter_obj[2+$index][1] = 'Group - ' . $user_groups[$index][1];
+						$filter_obj[2+$index][0] = $user_groups[$index]['account_id'];
+						$filter_obj[2+$index][1] = 'Group - ' . $user_groups[$index]['account_name'];
 					}
 				}
 			}
       
 			if (is_array($filter_obj))
 			{
-				$str .= '<select name="filter">';
+				$str .= '<select name="filter">'."\n";
           
 				$indexlimit = count($filter_obj);
 
@@ -333,10 +333,11 @@
 						$str .= ' selected';
 					}
 
-					$str .= '>' . $filter_obj[$index][1] . '</option>';
+					$str .= '>' . $filter_obj[$index][1] . '</option>'."\n";
 				}
           
-				$str .= '</select>';
+				$str .= '</select>'."\n";
+				$tpl->set_var('select',$str);
 				$tpl->set_var('lang_filter',lang('Filter'));
 			}
      
@@ -414,4 +415,4 @@
 		}
 
 	}		// End of nextmatchs class
-?>
\ No newline at end of file
+?>
diff --git a/phpgwapi/templates/default/nextmatchs_filter.tpl b/phpgwapi/templates/default/nextmatchs_filter.tpl
index bb1da0b89e..cd33a39d71 100644
--- a/phpgwapi/templates/default/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/default/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{search}<input type="submit" value="{lang_filter}"></td>
\ No newline at end of file
+<td width="14%">{select}<input type="submit" value="{lang_filter}"></td>
diff --git a/phpgwapi/templates/justweb/nextmatchs_filter.tpl b/phpgwapi/templates/justweb/nextmatchs_filter.tpl
index bb1da0b89e..cd33a39d71 100644
--- a/phpgwapi/templates/justweb/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/justweb/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{search}<input type="submit" value="{lang_filter}"></td>
\ No newline at end of file
+<td width="14%">{select}<input type="submit" value="{lang_filter}"></td>
diff --git a/phpgwapi/templates/verdilak/nextmatchs_filter.tpl b/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
index bb1da0b89e..cd33a39d71 100644
--- a/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{search}<input type="submit" value="{lang_filter}"></td>
\ No newline at end of file
+<td width="14%">{select}<input type="submit" value="{lang_filter}"></td>