diff --git a/addressbook/inc/hook_addressbook_deleteaccount.inc.php b/addressbook/inc/hook_addressbook_deleteaccount.inc.php
new file mode 100755
index 0000000000..e1a9e25344
--- /dev/null
+++ b/addressbook/inc/hook_addressbook_deleteaccount.inc.php
@@ -0,0 +1,29 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * Written by Joseph Engo <jengo@phpgroupware.org>                          *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+	/* $Id$ */
+	// Delete all records for a user
+	if (floor($PHP_VERSION ) == 4)
+	{
+		global $account_id, $new_owner;
+	}
+
+	$contacts = CreateObject('phpgwapi.contacts');
+
+	if($new_owner==0)
+	{
+		$contacts->delete_all($account_id);
+	}
+	else
+	{
+		$contacts->change_owner($account_id,$new_owner);
+	}
+?>
diff --git a/calendar/inc/hook_calendar_deleteaccount.inc.php b/calendar/inc/hook_calendar_deleteaccount.inc.php
new file mode 100755
index 0000000000..be7a65a3dc
--- /dev/null
+++ b/calendar/inc/hook_calendar_deleteaccount.inc.php
@@ -0,0 +1,31 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare                                                             *
+  * http://www.phpgroupware.org                                              *
+  * Written by Mark Peters <skeeter@phpgroupware.org>                        *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+	/* $Id$ */
+	
+	// Delete all records for a user
+	if (floor($PHP_VERSION ) == 4)
+	{
+		global $account_id, $new_owner;
+	}
+
+	$calendar = CreateObject('calendar.calendar');
+	$cal_stream = $calendar->open('INBOX',$account_id,'');
+	
+	if($new_owner==0)
+	{
+		$calendar->delete_calendar($cal_stream,$account_id);
+	}
+	else
+	{
+		$calendar->change_owner($account_id,$new_owner);
+	}
+?>
diff --git a/calendar/inc/hook_preferences.inc.php b/calendar/inc/hook_preferences.inc.php
index a3c9a60205..2d7c35509b 100644
--- a/calendar/inc/hook_preferences.inc.php
+++ b/calendar/inc/hook_preferences.inc.php
@@ -36,6 +36,9 @@
 	echo '<a href="' . $phpgw->link('/calendar/preferences.php') . '">' . lang('Calendar preferences')
 		. '</a><br>';
 
+	echo '<a href="' . $phpgw->link('/calendar/categories.php') . '">'
+		. lang('Edit Categories') . '</a><br>';
+
 	echo '<a href="' . $phpgw->link('/calendar/acl_preferences.php') . '">'
 		. lang('Grant Calendar Access') . '</a>';