diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 8e031a41..552bafc8 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -142,8 +142,8 @@ class calendar extends rcube_plugin
                 $this->rc->output->set_env('calendar_settings', $this->load_settings());
             }
 
-            // A hack to replace "Edit/Share Calendar" label with "Edit calendar", for CalDAV driver
-            if ($args['task'] == 'calendar' && $this->rc->config->get('calendar_driver', 'database') === 'caldav') {
+            // A hack to replace "Edit/Share Calendar" label with "Edit calendar", for non-Kolab driver
+            if ($args['task'] == 'calendar' && $this->rc->config->get('calendar_driver', 'database') !== 'kolab') {
                 $merge = ['calendar.editcalendar' => $this->gettext('edcalendar')];
                 $this->rc->load_language(null, [], $merge);
                 $this->rc->output->command('add_label', $merge);
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index f57848c4..e17aa635 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -156,8 +156,8 @@ class tasklist extends rcube_plugin
         }
 
         if (!$this->rc->output->ajax_call && empty($this->rc->output->env['framed'])) {
-            // A hack to replace "Edit/Share List" label with "Edit list", for CalDAV driver
-            if ($args['task'] == 'tasks' && $this->rc->config->get('tasklist_driver', 'database') === 'caldav') {
+            // A hack to replace "Edit/Share List" label with "Edit list", for non-Kolab drivers
+            if ($args['task'] == 'tasks' && $this->rc->config->get('tasklist_driver', 'database') !== 'kolab') {
                 $merge = ['tasklist.editlist' => $this->gettext('edlist')];
                 $this->rc->load_language(null, [], $merge);
                 $this->rc->output->command('add_label', $merge);