diff --git a/app/views/settings/_settings.html.erb b/app/views/settings/_settings.html.erb
index f3c5ef0..58382fe 100644
--- a/app/views/settings/_settings.html.erb
+++ b/app/views/settings/_settings.html.erb
@@ -23,4 +23,8 @@
     <%= check_box_tag 'settings[auto_update_attributes_on_login]', true, @settings[:auto_update_attributes_on_login] %><br />
     <em>On each login update Redmine user attributes from CAS extra user attributes</em>
   </p>
+  <p>
+    <label>Logout user in CAS</label>
+    <%= check_box_tag 'settings[cas_logout]', true, @settings[:cas_logout] %><br />
+  </p>
 </fieldset>
diff --git a/lib/redmine_cas.rb b/lib/redmine_cas.rb
index 5c21bee..5d903a8 100644
--- a/lib/redmine_cas.rb
+++ b/lib/redmine_cas.rb
@@ -25,7 +25,8 @@
       :cas_base_url                    => 'https://localhost',
       :login_without_cas               => false,
       :auto_create_users               => false,
-      :auto_update_attributes_on_login => false
+      :auto_update_attributes_on_login => false,
+      :cas_logout => true
     }, :partial => 'settings/settings'
   
   end
@@ -228,7 +229,7 @@ def login_with_cas
       alias_method_chain :login, :cas
     
       def logout_with_cas
-        if RedmineCas.ready?
+        if RedmineCas.ready? and RedmineCas.get_setting(:cas_logout)
           CASClient::Frameworks::Rails::Filter.logout(self, home_url)
           logout_user
         else
@@ -242,4 +243,4 @@ def logout_with_cas
 
   end
 
-end
\ No newline at end of file
+end