Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
===================================================================
diff -u -r7428db8926556617c5ab8bd46c279e2445992cc8 -r2c77fd87b16db132d3e8cc0f1d0a00b93add0a1b
--- lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java	(.../SessionManager.java)	(revision 7428db8926556617c5ab8bd46c279e2445992cc8)
+++ lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java	(.../SessionManager.java)	(revision 2c77fd87b16db132d3e8cc0f1d0a00b93add0a1b)
@@ -261,7 +261,7 @@
     private static Cookie createCookie(HttpServletResponse res, String name, String value) {
 	Cookie cookie = new Cookie(name, value);
 	cookie.setPath("/");
-	cookie.setMaxAge(-1);
+	cookie.setMaxAge(Configuration.getAsInt(ConfigurationKeys.INACTIVE_TIME));
 	res.addCookie(cookie);
 
 	return cookie;