diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 79bc7002..b6c5e234 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -33,7 +33,7 @@ class calendar extends rcube_plugin
 
   const SESSION_KEY = 'calendar_temp';
 
-  public $task = '?(?!logout).*';
+  public $task = '?(?!login|logout).*';
   public $rc;
   public $lib;
   public $resources_dir;