diff --git a/index.php b/index.php
index 5d37a93e0..e8111b113 100644
--- a/index.php
+++ b/index.php
@@ -121,7 +121,7 @@ if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') {
 }
 
 // end session
-else if (($RCMAIL->task=='logout' || $RCMAIL->action=='logout') && isset($_SESSION['user_id'])) {
+else if ($RCMAIL->task=='logout' && isset($_SESSION['user_id'])) {
   $OUTPUT->show_message('loggedout');
   $RCMAIL->logout_actions();
   $RCMAIL->kill_session();
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 3d0e7390a..455bbcfd2 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -969,7 +969,7 @@ class rcube_template extends rcube_html_page
         
         // save original url
         $url = get_input_value('_url', RCUBE_INPUT_POST);
-        if (empty($url) && !preg_match('/_action=logout/', $_SERVER['QUERY_STRING']))
+        if (empty($url) && !preg_match('/_(task|action)=logout/', $_SERVER['QUERY_STRING']))
             $url = $_SERVER['QUERY_STRING'];
 
         $input_user   = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser', 'size' => 30) + $attrib);
diff --git a/program/js/app.js b/program/js/app.js
index 218351ca3..216bebc80 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -367,9 +367,6 @@ function rcube_webmail()
         break;
       }
 
-    // enable basic commands
-    this.enable_command('logout', true);
-
     // flag object as complete
     this.loaded = true;
 
@@ -551,14 +548,11 @@ function rcube_webmail()
           this.gui_objects.loginform.submit();
         break;
 
-      case 'logout':
-        this.goto_url('logout', '', true);
-        break;
-
       // commands to switch task
       case 'mail':
       case 'addressbook':
       case 'settings':
+      case 'logout':
         this.switch_task(command);
         break;