diff --git a/ChangeLog b/ChangeLog
index 79b2dcea2..d80566756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js
+	(onToolbarDeleteSelectedContacts): delete the selected addressbook
+	if no contact is selected. Also checked if rows is defined
+	otherwise it would cause an error with Safari.
+
 2010-09-20  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 14d42d36e..bc2cad709 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -432,11 +432,11 @@ function onToolbarDeleteSelectedContacts(event) {
     var contactsList = $('contactsList');
     var rows = contactsList.getSelectedRowsId();
 
-    if (rows.length)
+    if (rows && rows.length)
         showConfirmDialog(_("Confirmation"),
                           _("Are you sure you want to delete the selected contacts?"),
                           onToolbarDeleteSelectedContactsConfirm);
-    else
+    else if (!onAddressBookRemove(event))
         showAlertDialog(_("Please select a contact."));
 
     return false;
@@ -784,6 +784,8 @@ function onAddressBookRemove(event) {
     }
 
     preventDefault(event);
+
+    return (nodes.length > 0);
 }
 
 function deletePersonalAddressBook(folderId) {