diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 15a4279b22..85ada21b83 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -260,7 +260,8 @@
 			
 			if (! $GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
 			{
-				$p->set_var('url_add','<a href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user').'">' . lang('Add') . '</a>');
+				$p->set_var('new_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user'));
+				$p->set_var('input_add','<input type="submit" value="' . lang('Add') . '">');
 			}
 
 			if (! $GLOBALS['phpgw']->acl->check('account_access',2,'admin'))
diff --git a/admin/templates/default/accounts.tpl b/admin/templates/default/accounts.tpl
index cb7e7a0384..57546d67fb 100644
--- a/admin/templates/default/accounts.tpl
+++ b/admin/templates/default/accounts.tpl
@@ -1,15 +1,5 @@
 <!-- BEGIN list -->
 <p>
-  <div align="center">
-   <table border="0" width="70%">
-    <tr>
-     <td align="right">
-	{url_add}
-     </td>
-    </tr>
-   </table>
-  </div>
-<br>
  <div align="center">
   <table border="0" width="70%">
    <tr>
@@ -39,6 +29,11 @@
   <div align="center">
    <table border="0" width="70%">
     <tr>
+	 <td align="left">
+	  <form method="POST" action="{new_action}">
+	   {input_add}
+	  </form>
+	 </td>
      <td align="right">
       <form method="POST" action="{accounts_url}">
        {input_search}