diff --git a/admin/editaccount.php b/admin/editaccount.php
index eac64c411a..f470392070 100755
--- a/admin/editaccount.php
+++ b/admin/editaccount.php
@@ -102,7 +102,7 @@
 			       . " account_lastname='" . addslashes($n_lastname) . "', account_permissions='"
 	  		       . $phpgw->accounts->add_app("",True) . "', account_status='"
 			       . "$n_account_status', account_groups='"
-  			       . $phpgw->accounts->array_to_string("none",$n_groups)
+  			       . $phpgw->accounts->groups_array_to_string($n_groups)
 			       . "' where account_lid='$n_loginid'");
 
         $phpgw->db->unlock();
diff --git a/admin/newaccount.php b/admin/newaccount.php
index c903d8a817..e8b76c8f76 100755
--- a/admin/newaccount.php
+++ b/admin/newaccount.php
@@ -71,7 +71,7 @@
 	        . "account_permissions,account_groups,account_status,account_lastpwd_change) values ('$n_loginid'"
 	        . ",'" . md5($n_passwd) . "','" . addslashes($n_firstname) . "','"
 	        . addslashes($n_lastname) . "','" . $phpgw->accounts->add_app("",True)
-	        . "','" . $phpgw->accounts->array_to_string("none",$n_groups) . "','A',0)";
+	        . "','" . $phpgw->accounts->groups_array_to_string($n_groups) . "','A',0)";
 
         $phpgw->db->query($sql);
         $phpgw->db->unlock();
@@ -116,10 +116,10 @@
   $t->set_var("n_passwd_2_value",$n_passwd_2);
 
   $t->set_var("lang_firstname",lang("First Name"));
-  $t->set_var("n_firstname_value",$firstname_value);
+  $t->set_var("n_firstname_value",$firstname);
 
   $t->set_var("lang_lastname",lang("Last Name"));
-  $t->set_var("n_lastname_value",$lastname_value);
+  $t->set_var("n_lastname_value",$lastname);
 
   $t->set_var("lang_groups",lang("Groups"));
   $group_select = '<select name="n_groups[]" multiple>';
diff --git a/admin/viewaccount.php b/admin/viewaccount.php
index df5a3ef9ff..3a5acb7eeb 100755
--- a/admin/viewaccount.php
+++ b/admin/viewaccount.php
@@ -47,16 +47,16 @@
 
     <tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>">
      <td width="40%"><?php echo lang("First Name"); ?></td>
-     <td width="60%"><?php echo $phpgw->db->f("account_firstname"); ?></td>
+     <td width="60%"><?php echo $phpgw->db->f("account_firstname"); ?>&nbsp;</td>
     </tr>
 
     <tr bgcolor="<?php echo $phpgw_info["theme"]["row_on"]; ?>">
      <td width="40%"><?php echo lang("Last Name"); ?></td>
-     <td width="60%"><?php echo $phpgw->db->f("account_lastname"); ?></td>
+     <td width="60%"><?php echo $phpgw->db->f("account_lastname"); ?>&nbsp;</td>
     </tr>
 
     <tr bgcolor="<?php echo $phpgw_info["theme"]["row_off"]; ?>">
-     <td width="40%"><?php echo lang("account_permissions"); ?></td>
+     <td width="40%"><?php echo lang("account_permissions"); ?>&nbsp;</td>
     <?php
 
       $i = 0;
@@ -106,5 +106,5 @@
    </center>
 
 <?php
-        $phpgw->common->phpgw_footer();
+  $phpgw->common->phpgw_footer();
 ?>