diff --git a/src/database/redis.js b/src/database/redis.js
index 47e552455a..2eeddb7943 100644
--- a/src/database/redis.js
+++ b/src/database/redis.js
@@ -46,7 +46,7 @@
 
 	module.sessionStore = new connectRedis({
 		client: redisClient,
-		ttl: 60 * 60 * 24 * 30
+		ttl: 60 * 60 * 24 * 14
 	});
 
 	reds.createClient = function () {
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index 0e0f61c79c..2476b391f2 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -116,8 +116,11 @@
 
 					// Alter user cookie depending on passed-in option
 					if (req.body.remember === 'true') {
-						req.session.cookie.maxAge = 1000*60*60*24*parseInt(meta.configs.loginDays || 14, 10);
+						var duration = 1000*60*60*24*parseInt(meta.configs.loginDays || 14, 10);
+						req.session.cookie.maxAge = duration;
+						req.session.cookie.expires = new Date(Date.now() + duration);
 					} else {
+						req.session.cookie.maxAge = false;
 						req.session.cookie.expires = false;
 					}
 
diff --git a/src/webserver.js b/src/webserver.js
index 92a13adf1a..ed79448f82 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -209,7 +209,7 @@ module.exports.server = server;
 					secret: nconf.get('secret'),
 					key: 'express.sid',
 					cookie: {
-						maxAge: 60 * 60 * 24 * 30 * 1000 // 30 days
+						maxAge: 1000 * 60 * 60 * 24 * parseInt(meta.configs.loginDays || 14, 10)
 					}
 				}));