diff --git a/VERSION b/VERSION
index 8a599fab..cc5494b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-01-12 12:45:12) stable
+Version 1.99.4 (2012-01-12 12:47:39) stable
diff --git a/gluon/tools.py b/gluon/tools.py
index 7a660672..942d0856 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1775,7 +1775,8 @@ class Auth(object):
             session.auth = Storage(
                 user = user,
                 last_visit = request.now,
-                expiration = self.settings.long_expiration,
+                expiration = request.vars.get("remember",False) and \
+                    self.settings.long_expiration or self.settings.expiration,
                 remember = request.vars.has_key("remember"),
                 hmac_key = web2py_uuid()
                 )