diff --git a/templates/layouts/swagg.html.ep b/templates/layouts/swagg.html.ep
index b10f242..fadb05d 100644
--- a/templates/layouts/swagg.html.ep
+++ b/templates/layouts/swagg.html.ep
@@ -25,7 +25,7 @@
 <script>
   function closeIt() {
       document.getElementById("gdpr").style.display = "none";
-      document.cookie = "banner=seen; max-age=600;";
+      document.cookie = "banner=seen; <%= $sessionLife %>;";
   }
 
   function playIt() {
diff --git a/www-swagg.pl b/www-swagg.pl
index d05296a..4a07eed 100755
--- a/www-swagg.pl
+++ b/www-swagg.pl
@@ -16,15 +16,19 @@ plugin CGI => ['/cgi-bin/whoami.cgi' => './cgi-bin/whoami.cgi'  ];
 
 # Handle the session
 under sub {
-    my ($c) = @_;
+    my ($c)         = @_;
+    my $sessionLife = 604800;
 
     if ($c->cookie('banner') eq 'seen') {
         # Set session for a week
-        $c->session(expiration => 604800)->{banner} //= 'seen';
+        $c->session(expiration => $sessionLife, banner => 'seen');
         # Kill plain-text cookie
         $c->cookie(banner => 'seen', {expires => 1});
     }
 
+    # Pass in the expiration for plain-text cookie
+    $c->stash(sessionLife => $sessionLife);
+
     1;
 };