Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.65 -r1.66
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	24 Feb 2011 09:42:40 -0000	1.65
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	15 Apr 2011 15:16:33 -0000	1.66
@@ -495,13 +495,15 @@
     # we fetch the last value element of ad_user_login cookie (or ad_user_login_secure) that indicates
     # if user wanted to be remembered when loggin in
     set discard t
+    set max_age [sec_session_timeout]
     catch { 
-	set login_list [sec_login_read_cookie]
-	if {[lindex $login_list end] == 1} {
-	    set discard f
-	}
+	    set login_list [sec_login_read_cookie]
+      	if {[lindex $login_list end] == 1} {
+	        set discard f
+            set max_age inf
+	    }
     }
-    ad_set_signed_cookie -discard $discard -replace t -max_age [sec_session_timeout] -domain $domain \
+    ad_set_signed_cookie -discard $discard -replace t -max_age $max_age -domain $domain \
 	    "ad_session_id" "$session_id,$user_id,$login_level"
 }