diff --git a/admin/deleteaccount.php b/admin/deleteaccount.php
index 0760813006..20e4833f96 100755
--- a/admin/deleteaccount.php
+++ b/admin/deleteaccount.php
@@ -64,7 +64,7 @@
        $i++;
      }
 
-     $table_locks = array('preferences','todo','addressbook','accounts','users_headlines',
+     $table_locks = array('preferences','todo','addressbook','accounts',
                           'webcal_entry','webcal_entry_user','webcal_entry_repeats',
                           'webcal_entry_groups');
      $phpgw->db->lock($table_locks);
@@ -81,7 +81,7 @@
      $phpgw->db->query("delete from todo where owner='$lid'");
      $phpgw->db->query("delete from addressbook where owner='$lid'");
      $phpgw->db->query("delete from accounts where loginid='$lid'");
-     $phpgw->db->query("delete from users_headlines where owner='$lid'");
+     //$phpgw->db->query("delete from users_headlines where owner='$lid'");
      //$phpgw->db->query("delete from profiles where owner='$lid'");
 
      $phpgw->db->unlock();
diff --git a/calendar/view.php b/calendar/view.php
index 307f57af53..5568482fbb 100755
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -126,7 +126,7 @@
 </TR>
 
 <?php
-  $cal_groups_temp = $phpgw->accounts->read_group_names($id);
+  $cal_groups_temp = $phpgw->accounts->read_group_names();
   for($i = 0; $i < count($cal_groups_temp); $i++) {
     $cal_groups .= $cal_groups_temp[$i][1] . "<br>\n";
   }