diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 51ed0411..b7718ccf 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -510,6 +510,7 @@ function rcube_calendar_ui(settings)
         }
 
         var show_rsvp = rsvp && !organizer && event.status != 'CANCELLED' && me.has_permission(calendar, 'v');
+        console.log(event, rsvp, organizer, status, calendar, me.has_permission(calendar, 'v'), show_rsvp);
         $('#event-rsvp')[(show_rsvp ? 'show' : 'hide')]();
         $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel="'+(mystatus || '')+'"]').prop('disabled', true);
 
diff --git a/plugins/calendar/drivers/ldap/resources_driver_ldap.php b/plugins/calendar/drivers/ldap/resources_driver_ldap.php
index 3719b706..faa7b549 100644
--- a/plugins/calendar/drivers/ldap/resources_driver_ldap.php
+++ b/plugins/calendar/drivers/ldap/resources_driver_ldap.php
@@ -57,7 +57,8 @@ class resources_driver_ldap extends resources_driver
         $ldap->set_pagesize($num);
 
         if (isset($query)) {
-            $results = $ldap->search($searchField, $query, 0, true, true);
+            $mode = $searchField == 'owner' ? rcube_addressbook::SEARCH_STRICT : 0;
+            $results = $ldap->search($searchField, $query, $mode, true, true);
         }
         else {
             $results = $ldap->list_records();