diff --git a/admin/groups.php b/admin/groups.php
index 92645f4291..3e7875180d 100755
--- a/admin/groups.php
+++ b/admin/groups.php
@@ -33,19 +33,20 @@
 		return $phpgw->db->f(0);
 	}
 
-	$p = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('admin'));
+	$p = new Template(PHPGW_APP_TPL);
 	$p->set_file(array(
-		'list'      => 'groups.tpl',
-		'row'       => 'groups_row.tpl',
-		'empty_row' => 'accounts_row_empty.tpl'
+		'groups'   => 'groups.tpl',
 	));
+	$p->set_block('groups','list','list');
+	$p->set_block('groups','row','row');
+	$p->set_block('groups','row_empty','row_empty');
 
 	$total = account_total($query);
  
 	$p->set_var('th_bg',$phpgw_info['theme']['th_bg']);
 
-	$p->set_var('left_nextmatchs',$phpgw->nextmatchs->left('/admin/groups.php',$start,$total));
-	$p->set_var('right_nextmatchs',$phpgw->nextmatchs->right('/admin/groups.php',$start,$total));
+	$p->set_var('left_next_matchs',$phpgw->nextmatchs->left('/admin/groups.php',$start,$total));
+	$p->set_var('right_next_matchs',$phpgw->nextmatchs->right('/admin/groups.php',$start,$total));
 	$p->set_var('lang_groups',lang('user groups'));
 
 	$p->set_var('sort_name',$phpgw->nextmatchs->show_sort_order($sort,"account_lid",$order,"/admin/groups.php",lang("name")));
diff --git a/admin/templates/default/groups.tpl b/admin/templates/default/groups.tpl
index fd2ca1162c..018bec39e7 100644
--- a/admin/templates/default/groups.tpl
+++ b/admin/templates/default/groups.tpl
@@ -2,9 +2,9 @@
 <p>
  <table border="0" width="45%" align="center">
   <tr>
-   <td align="left">{left_nextmatchs}</td>
+   <td align="left">{left_next_matchs}</td>
    <td align="center">{lang_groups}</td>
-   <td align="right">{right_nextmatchs}</td>
+   <td align="right">{right_next_matchs}</td>
   </tr>
  </table>
 
@@ -34,3 +34,17 @@
   </tr>
  </table>
 <!-- END list -->
+
+<!-- BEGIN row -->
+ <tr bgcolor="{tr_color}">
+  <td>{group_name}</td>
+  <td width="5%">{edit_link}</td>
+  <td width="5%">{delete_link}</td>
+ </tr>
+<!-- END row -->
+
+<!-- BEGIN row_empty -->
+   <tr>
+    <td colspan="5" align="center">{message}</td>
+   </tr>
+<!-- END row_empty -->