diff --git a/admin/accounts.php b/admin/accounts.php
index 89be080393..9f6da40f5d 100755
--- a/admin/accounts.php
+++ b/admin/accounts.php
@@ -17,11 +17,8 @@
   include($phpgw_info["server"]["server_root"] . "/admin/inc/accounts_"
         . $phpgw_info["server"]["account_repository"] . ".inc.php");
 
-  $phpgw->template->set_file(array("header" => "accounts.tpl",
-              			         "row"	=> "accounts.tpl",
-              			         "footer" => "accounts.tpl"));
-
-  $phpgw->template->set_block("header","row","footer");
+  $phpgw->template->set_file(array("list"   => "accounts.tpl",
+              			         "row"    => "accounts_row.tpl"));
 
   $total = account_total();
 
@@ -40,8 +37,6 @@
   $phpgw->template->set_var("lang_delete",lang("Delete"));
   $phpgw->template->set_var("lang_view",lang("View"));
 
-  $phpgw->template->parse("out","header");
-
   $account_info = account_read($method,$start,$sort,$order);
 
   while (list($null,$account) = each($account_info)) {
@@ -69,7 +64,7 @@
     $phpgw->template->set_var("row_firstname",$firstname);
     $phpgw->template->set_var("row_lastname",$lastname);
     $phpgw->template->set_var("row_edit",'<a href="'.$phpgw->link("editaccount.php","account_id="
-    				     . $account_id) . '"> ' . lang("Edit") . ' </a>');
+       				     . $account_id) . '"> ' . lang("Edit") . ' </a>');
 
     if ($phpgw_info["user"]["userid"] != $account["account_lid"]) {
        $phpgw->template->set_var("row_delete",'<a href="' . $phpgw->link("deleteaccount.php",'account_id='
@@ -79,21 +74,16 @@
     }
 
     $phpgw->template->set_var("row_view",'<a href="' . $phpgw->link("viewaccount.php", "account_id="
-				         . $account_id) . '"> ' . lang("View") . ' </a>');
+   				         . $account_id) . '"> ' . lang("View") . ' </a>');
 
-    if ($total == 1) {
-       $phpgw->template->set_var("output","");
-    }
-    if ($total != ++$i) {
-       $phpgw->template->parse("output","row",True);
-    }
+    $phpgw->template->parse("rows","row",True);
   }
 
   $phpgw->template->set_var("actionurl",$phpgw->link("newaccount.php"));
   $phpgw->template->set_var("lang_add",lang("add"));
   $phpgw->template->set_var("lang_search",lang("search"));
 
-  $phpgw->template->pparse("out","footer");
+  $phpgw->template->pparse("out","list");
 
   $phpgw->common->phpgw_footer();
   
diff --git a/admin/templates/default/accounts.tpl b/admin/templates/default/accounts.tpl
index 485f36b4a9..25fad032e6 100644
--- a/admin/templates/default/accounts.tpl
+++ b/admin/templates/default/accounts.tpl
@@ -1,4 +1,4 @@
-<!-- BEGIN header -->
+<!-- BEGIN list -->
 <p>
  <table border="0" width="70%" align="center">
   <tr bgcolor="{bg_color}">
@@ -18,22 +18,9 @@
     <td>{lang_delete}</td>
     <td>{lang_view}</td>
    </tr>
-<!-- END header -->
 
-{output}
+   {rows}
 
-<!-- BEGIN row -->
-   <tr bgcolor="{tr_color}">
-    <td>{row_loginid}</td>
-    <td>{row_lastname}</td>
-    <td>{row_firstname}</td>
-    <td width="5%">{row_edit}</td>
-    <td width="5%">{row_delete}</td>
-    <td width="5%">{row_view}</td>
-   </tr>
-<!-- END row -->
-
-<!-- BEGIN footer -->
   </table>
  </center>
 
@@ -52,4 +39,4 @@
    </tr>
   </table>
 
-<!-- END footer -->
+<!-- END list -->
diff --git a/admin/templates/default/accounts_row.tpl b/admin/templates/default/accounts_row.tpl
new file mode 100644
index 0000000000..7daa706e3f
--- /dev/null
+++ b/admin/templates/default/accounts_row.tpl
@@ -0,0 +1,11 @@
+
+<!-- BEGIN row -->
+   <tr bgcolor="{tr_color}">
+    <td>{row_loginid}</td>
+    <td>{row_lastname}</td>
+    <td>{row_firstname}</td>
+    <td width="5%">{row_edit}</td>
+    <td width="5%">{row_delete}</td>
+    <td width="5%">{row_view}</td>
+   </tr>
+<!-- END row -->