diff --git a/admin/inc/accounts_sql.inc.php b/admin/inc/accounts_sql.inc.php
index 92f263efa1..b8c61e23d7 100755
--- a/admin/inc/accounts_sql.inc.php
+++ b/admin/inc/accounts_sql.inc.php
@@ -184,16 +184,16 @@
      $phpgw->db->lock($table_locks);
 
      for ($i=0; $i<count($cal_id); $i++) {
-        $phpgw->db->query("delete from webcal_entry_repeats where cal_id='$cal_id[$i]'");
-        $phpgw->db->query("delete from webcal_entry_groups where cal_id='$cal_id[$i]'");
+        $phpgw->db->query("delete from webcal_entry_repeats where cal_id='".$cal_id[$i]."'");
+        $phpgw->db->query("delete from webcal_entry_groups where cal_id='".$cal_id[$i]."'");
      }
 
-     $phpgw->db->query("delete from webcal_entry where cal_create_by='$account_id'");
-     $phpgw->db->query("delete from webcal_entry_user where cal_login='$account_id'");
+     $phpgw->db->query("delete from webcal_entry where cal_create_by='".$account_id."'");
+     $phpgw->db->query("delete from webcal_entry_user where cal_login='".$account_id."'");
 
-     $phpgw->db->query("delete from todo where todo_owner='$account_id'");
-     $phpgw->db->query("delete from addressbook where ab_owner='$account_id'");
-     $phpgw->db->query("delete from accounts where account_lid='$account_id'");
+     $phpgw->db->query("delete from todo where todo_owner='".$account_id."'");
+     $phpgw->db->query("delete from addressbook where ab_owner='".$account_id."'");
+     $phpgw->db->query("delete from accounts where account_id='".$account_id."'");
      
      $phpgw->common->preferences_delete("all",$account_id);
 
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0bb6618f6a..aca13fce26 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,6 +6,7 @@
 		- Fixed a problem with the email folders only reporting back the number of messages
 		  in the INBOX regardless of which folder it is in.
 		- Added calendar day view to home page.
+		- Fixed problem with deletion of accounts.
 
 [0.9.3] - Fixed the new user account form not returning the users firstname or last name when an
 	      error is reported.