diff --git a/admin/editaccount.php b/admin/editaccount.php
index 4352067ebf..721fe11eef 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -12,7 +12,10 @@
   /* $Id$ */
 
   $phpgw_info = array();
-  $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True, "currentapp" => "admin");
+  $phpgw_info["flags"] = array("noheader" => True, 
+			       "nonavbar" => True, 
+			       "currentapp" => "admin",
+			       "parent_page" => "accounts.php");
   include("../header.inc.php");
   include($phpgw_info["server"]["app_inc"]."/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
 
@@ -136,11 +139,20 @@
       $phpgw->template->set_var("form_action",$phpgw->link("editaccount.php","account_id=" . $userData["account_id"] . "&old_loginid=" . $userData["account_lid"]));
   }
 
+  $phpgw->template->set_var("tr_color1",$phpgw_info["theme"]["row_on"]);
+  $phpgw->template->set_var("tr_color2",$phpgw_info["theme"]["row_off"]);
+
   $phpgw->template->set_var("lang_action",lang("Edit user account"));
 
   $phpgw->template->set_var("lang_loginid",lang("LoginID"));
   $phpgw->template->set_var("n_loginid_value",$n_loginid);
 
+  $phpgw->template->set_var("lang_account_active",lang("Account active"));
+  if ($userData["status"]) 
+    $phpgw->template->set_var("account_checked","checked");
+  else
+    $phpgw->template->set_var("account_checked","");
+
   $phpgw->template->set_var("lang_password",lang("Password"));
   $phpgw->template->set_var("n_passwd_value",$n_passwd);
 
@@ -184,7 +196,7 @@
 
   for ($i=0;$i<200;) {     // The $i<200 is only used for a brake
      if (! $perm_display[$i][1]) break;
-     $perm_html .= '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
+     $perm_html .= '<tr bgcolor="'.$phpgw_info["theme"]["row_on"].'"><td>' . lang($perm_display[$i][1]) . '</td>'
                  . '<td><input type="checkbox" name="new_permissions['
                  . $perm_display[$i][0] . ']" value="True"';
      if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) {
@@ -203,11 +215,11 @@
      $perm_html .= "></td></tr>";
      $i++;
   }
-  $perm_html .= '<tr><td colspan="4" align="center">' . lang("Account active") . ':&nbsp;<input type="checkbox" name="n_account_status" value="A"' . ($userData["status"]?" checked":"") . '></td></tr>';
 
   $phpgw->template->set_var("permissions_list",$perm_html);
 
-  $phpgw->template->set_var("lang_button",lang("Edit"));
+
+  $phpgw->template->set_var("lang_button",lang("Save"));
   $phpgw->template->pparse("out","form");
 
   account_close();
diff --git a/admin/newaccount.php b/admin/newaccount.php
index 5d850bc27e..c0ac48858c 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -12,7 +12,10 @@
   /* $Id$ */
 
   $phpgw_info = array();
-  $phpgw_info["flags"] = array("currentapp" => "admin", "noheader" => True, "nonavbar" => True);
+  $phpgw_info["flags"] = array("currentapp" => "admin", 
+  			       "noheader" => True, 
+  			       "nonavbar" => True,
+  			       "parent_page" => "accounts.php");
   include("../header.inc.php");
   include($phpgw_info["server"]["app_inc"]."/accounts_".$phpgw_info["server"]["account_repository"].".inc.php");
 
@@ -77,11 +80,16 @@
   } else {
      $phpgw->template->set_var("error_messages","");
   }
+
+  $phpgw->template->set_var("tr_color1",$phpgw_info["theme"]["row_on"]);
+  $phpgw->template->set_var("tr_color2",$phpgw_info["theme"]["row_off"]);
   
   $phpgw->template->set_var("form_action",$phpgw->link("newaccount.php"));
   $phpgw->template->set_var("lang_loginid",lang("LoginID"));
   $phpgw->template->set_var("n_loginid_value",$n_loginid);
 
+  $phpgw->template->set_var("lang_account_active",lang("Account active"));
+
   $phpgw->template->set_var("lang_password",lang("Password"));
   $phpgw->template->set_var("n_passwd_value",$n_passwd);
   
@@ -123,7 +131,7 @@
   for ($i=0;$i<200;) {		// The $i<200 is only used for a brake
       if (! $perm_display[$i][1]) break;
 
-      $perms_html .= '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
+      $perms_html .= '<tr bgcolor="'.$phpgw_info["theme"]["row_on"].'"><td>' . lang($perm_display[$i][1]) . '</td>'
                   . '<td><input type="checkbox" name="new_permissions['
 		          . $perm_display[$i][0] . ']" value="True"';
       if ($new_permissions[$perm_display[$i][0]]) {
diff --git a/admin/templates/default/account_form.tpl b/admin/templates/default/account_form.tpl
index b4e1d9dd43..ab2caf80af 100644
--- a/admin/templates/default/account_form.tpl
+++ b/admin/templates/default/account_form.tpl
@@ -4,41 +4,40 @@
  <form method="POST" action="{form_action}">
   <center>
    <table border=0 width=65%>
-    <tr>
+    <tr bgcolor="{tr_color1}">
      <td>{lang_loginid}</td>
      <td><input name="n_loginid" value="{n_loginid_value}"></td>
+     <td colspan="2" align="center">
+       {lang_account_active}:&nbsp;<input type="checkbox" name="n_account_status" value="A" {account_checked}>
+     </td>
     </tr>
 
-    <tr>
+    <tr bgcolor="{tr_color2}">
+     <td>{lang_firstname}</td>
+     <td><input name="n_firstname" value="{n_firstname_value}"></td>
+     <td>{lang_lastname}</td>
+     <td><input name="n_lastname" value="{n_lastname_value}"></td>
+    </tr>
+
+    <tr bgcolor="{tr_color1}">
      <td>{lang_password}</td>
      <td><input type="password" name="n_passwd" value="{n_passwd_value}"></td>
-    </tr>
-
-    <tr>
      <td>{lang_reenter_password}</td>
      <td><input type="password" name="n_passwd_2" value="{n_passwd_2_value}"></td>
     </tr>
 
-    <tr>
-     <td>{lang_firstname}</td>
-     <td><input name="n_firstname" value="{n_firstname_value}"></td>
-    </tr>
-
-    <tr>
-     <td>{lang_lastname}</td>
-     <td><input name="n_lastname" value="{n_lastname_value}"></td>
-    </tr>
  
-    <tr>
+    <tr bgcolor="{tr_color2}">
      <td>{lang_groups}</td>
      <td>{groups_select}</td>
+     <td colspan=2>&nbsp;</td>
     </tr>
 
     {permissions_list}
 
-     <tr>
-      <td colspan="2" align="center"><input type="submit" name="submit" value="{lang_button}"></td>
-     </tr>
+    <tr bgcolor="{tr_color2}">
+     <td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td>
+    </tr>
    </table>
   </center>
  </form>