diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index cc89d5954..e0bcb6b48 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -98,6 +98,14 @@ class CakeSession extends Object {
  */
 	var $sessionTime = false;
 
+/**
+ * The number of seconds to set for session.cookie_lifetime.  0 means
+ * at browser close.
+ *
+ * @var integer
+ */
+	var $cookieLifeTime = false;
+
 /**
  * Keeps track of keys to watch for writes on
  *
@@ -188,7 +196,7 @@ class CakeSession extends Object {
 			if (!class_exists('Security')) {
 				App::import('Core', 'Security');
 			}
-			$this->sessionTime = $this->time + (Security::inactiveMins() * 60 * Configure::read('Session.timeout'));
+			$this->sessionTime = $this->time + (Security::inactiveMins() * Configure::read('Session.timeout'));
 			$this->security = Configure::read('Security.level');
 		}
 		parent::__construct();
@@ -465,8 +473,13 @@ class CakeSession extends Object {
 		}
 		if ($iniSet && ($this->security === 'high' || $this->security === 'medium')) {
 			ini_set('session.referer_check', $this->host);
+		} 
+
+		if ($this->security == 'high') {
+			$this->cookieLifeTime = 0;
+		} else {
+			$this->cookieLifeTime = Configure::read('Session.timeout') * (Security::inactiveMins() * 60);
 		}
-		$this->cookieLifeTime = Configure::read('Session.timeout') * (Security::inactiveMins() * 60);
 
 		switch (Configure::read('Session.save')) {
 			case 'cake':
@@ -593,9 +606,9 @@ class CakeSession extends Object {
 					$check -= 1;
 					$this->write('Config.timeout', $check);
 
-					if (time() > ($time - (Security::inactiveMins() * 60 * Configure::read('Session.timeout')) + 2) || $check < 1) {
+					if (time() > ($time - (Security::inactiveMins() * Configure::read('Session.timeout')) + 2) || $check < 1) {
 						$this->renew();
-						$this->write('Config.timeout', Security::inactiveMins());
+						$this->write('Config.timeout', 10);
 					}
 				}
 				$this->valid = true;
@@ -607,7 +620,7 @@ class CakeSession extends Object {
 		} else {
 			$this->write('Config.userAgent', $this->_userAgent);
 			$this->write('Config.time', $this->sessionTime);
-			$this->write('Config.timeout', Security::inactiveMins());
+			$this->write('Config.timeout', 10);
 			$this->valid = true;
 			$this->__setError(1, 'Session is valid');
 		}
@@ -735,7 +748,7 @@ class CakeSession extends Object {
  * @access private
  */
 	function __write($id, $data) {
-		$expires = time() + Configure::read('Session.timeout') * Security::inactiveMins() * 60;
+		$expires = time() + Configure::read('Session.timeout') * Security::inactiveMins();
 		$model =& ClassRegistry::getObject('Session');
 		$return = $model->save(compact('id', 'data', 'expires'));
 		return $return;
diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php
index 939b922b4..2241afa5c 100644
--- a/cake/tests/cases/libs/controller/components/session.test.php
+++ b/cake/tests/cases/libs/controller/components/session.test.php
@@ -355,32 +355,32 @@ class SessionComponentTest extends CakeTestCase {
 		$Session =& new SessionComponent();
 		$Session->write('Test', 'some value');
 
-		$this->assertEqual($Session->sessionTime, mktime() + (300 * 60 * Configure::read('Session.timeout')));
+		$this->assertEqual($Session->sessionTime, mktime() + (300 * Configure::read('Session.timeout')));
 		$this->assertEqual($_SESSION['Config']['timeout'], Security::inactiveMins());
 		$this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime);
 		$this->assertEqual($Session->time, mktime());
-		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * 60 * Configure::read('Session.timeout')));
+		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() *  Configure::read('Session.timeout')));
 
 		session_destroy();
 		Configure::write('Security.level', 'medium');
 		$Session =& new SessionComponent();
 		$Session->write('Test', 'some value');
-		$this->assertEqual($Session->sessionTime, mktime() + (100 * 60 * Configure::read('Session.timeout')));
+		$this->assertEqual($Session->sessionTime, mktime() + (100 * Configure::read('Session.timeout')));
 		$this->assertEqual($_SESSION['Config']['timeout'], Security::inactiveMins());
 		$this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime);
 		$this->assertEqual($Session->time, mktime());
-		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * 60 * Configure::read('Session.timeout')));
+		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() *  Configure::read('Session.timeout')));
 
 
 		session_destroy();
 		Configure::write('Security.level', 'high');
 		$Session =& new SessionComponent();
 		$Session->write('Test', 'some value');
-		$this->assertEqual($Session->sessionTime, mktime() + (10 * 60 * Configure::read('Session.timeout')));
+		$this->assertEqual($Session->sessionTime, mktime() + (10 * Configure::read('Session.timeout')));
 		$this->assertEqual($_SESSION['Config']['timeout'], Security::inactiveMins());
 		$this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime);
 		$this->assertEqual($Session->time, mktime());
-		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * 60 * Configure::read('Session.timeout')));
+		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * Configure::read('Session.timeout')));
 
 	}
 }