diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 698ae2a0..f396c23c 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -198,6 +198,9 @@ class calendar extends rcube_plugin
 
     $this->rc->output->add_label('low','normal','high','delete','cancel','uploading','noemailwarning');
 
+    // initialize attendees autocompletion
+    rcube_autocomplete_init();
+
     $this->rc->output->send("calendar.calendar");
   }
 
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 3eefd910..59cb4883 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1885,9 +1885,17 @@ function rcube_calendar_ui(settings)
         $('#recurrence-form-'+freq+', #recurrence-form-until').show();
     });
     $('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
-    
+
     // init attendees autocompletion
-    rcmail.init_address_input_events($('#edit-attendee-name'));
+    var ac_props;
+    // parallel autocompletion
+    if (rcmail.env.autocomplete_threads > 0) {
+      ac_props = {
+        threads: rcmail.env.autocomplete_threads,
+        sources: rcmail.env.autocomplete_sources,
+      };
+    }
+    rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
     rcmail.addEventListener('autocomplete_insert', function(e){ $('#edit-attendee-add').click(); });
 
     $('#edit-attendee-add').click(function(){
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 6f5e25a6..3bd9a870 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -400,7 +400,6 @@ class database_driver extends calendar_driver
   private function _update_event($event, $update_recurring = true)
   {
     $event = $this->_save_preprocess($event);
-    console($event);
     $sql_set = array();
     $set_cols = array('all_day', 'recurrence', 'recurrence_id', 'title', 'description', 'location', 'categories', 'free_busy', 'priority', 'sensitivity', 'attendees', 'alarms', 'notifyat');
     foreach ($set_cols as $col) {