diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
index 49f952eb7..5fb7913ec 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
@@ -134,8 +134,8 @@
     </servlet-mapping>
 
     <session-config>
-        <!-- The session timeout is an hour -->
-        <session-timeout>60</session-timeout>
+        <!-- The session timeout is ten minutes. A timer is used to keep the session alive if there is some open page -->
+        <session-timeout>10</session-timeout>
     </session-config>
 
     <welcome-file-list>
diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml b/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml
index dcc4cea44..4e1387b57 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml
@@ -6,7 +6,7 @@
     <desktop-config>
         <!-- seconds it takes between requests for a desktop to be invalidated -->
         <!-- a timer is introduced to avoid invalidation of pages still open -->
-        <desktop-timeout>60</desktop-timeout>
+        <desktop-timeout>30</desktop-timeout>
     </desktop-config>
 
     <session-config>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 835412ce9..0a2bd155d 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -45,7 +45,7 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
 
 <div xmlns:n="http://www.zkoss.org/2005/zk/native" apply="${templateCtrl}" height="100%">
 
-<timer repeats="true" running="true" delay="30000" onTimer=""/>
+<timer repeats="true" running="true" delay="20000" onTimer=""/>
 <borderlayout height="100%" width="100%" >
 <north border="none">
 <n:div>