diff --git a/plugins/kolab_auth/config.inc.php.dist b/plugins/kolab_auth/config.inc.php.dist
index b353d61a..77cbe4ac 100644
--- a/plugins/kolab_auth/config.inc.php.dist
+++ b/plugins/kolab_auth/config.inc.php.dist
@@ -53,6 +53,8 @@ $config['kolab_auth_admin_rights'] = array(
     'settings'        => 'entry:read',
     'mail'            => 'entry:delete',
     'addressbook'     => 'entry:delete',
+    // or use a wildcard entry like this:
+    '*'               => 'entry:read',
 );
 
 // Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
diff --git a/plugins/kolab_auth/kolab_auth.php b/plugins/kolab_auth/kolab_auth.php
index 31f50ad7..fa70ee9c 100644
--- a/plugins/kolab_auth/kolab_auth.php
+++ b/plugins/kolab_auth/kolab_auth.php
@@ -96,13 +96,15 @@ class kolab_auth extends rcube_plugin
             // redirect to the first task on the list
             if (!empty($_SESSION['kolab_auth_allowed_tasks'])) {
                 $tasks = (array)$_SESSION['kolab_auth_allowed_tasks'];
-                if (!in_array($args['task'], $tasks)) {
+                if (!in_array($args['task'], $tasks) && !in_array('*', $tasks)) {
                     header('Location: ?_task=' . array_shift($tasks));
                     die;
                 }
 
                 // add script that will remove disabled taskbar buttons
-                $this->add_hook('render_page', array($this, 'render_page'));
+                if (!in_array('*', $tasks)) {
+                    $this->add_hook('render_page', array($this, 'render_page'));
+                }
             }
         }