diff --git a/salt/auth/init.sls b/salt/auth/init.sls
index 18850d534..abbe514d3 100644
--- a/salt/auth/init.sls
+++ b/salt/auth/init.sls
@@ -15,6 +15,7 @@ so-auth-api:
         - name: so-auth-api
         - environment:
             - BASE_PATH: "/so-auth/api"
+            - AUTH_TOKEN_TIMEOUT: 32400
         - binds:
             - /opt/so/conf/auth/api:/data
         - port_bindings:
diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval
index d3e377881..701f558e7 100644
--- a/salt/common/nginx/nginx.conf.so-eval
+++ b/salt/common/nginx/nginx.conf.so-eval
@@ -246,7 +246,7 @@ http {
         error_page 401 = @error401;
 
         location @error401 {
-          add_header    Set-Cookie "NSREDIRECT=http://{{ masterip }}$request_uri;Domain={{ masterip }};Path=/";
+          add_header    Set-Cookie "NSREDIRECT=http://{{ masterip }}$request_uri;Domain={{ masterip }};Path=/;Max-Age=60000";
           return        302 http://{{ masterip }}/so-auth/loginpage/;
         }
 
diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master
index 3cac44155..2c836962c 100644
--- a/salt/common/nginx/nginx.conf.so-master
+++ b/salt/common/nginx/nginx.conf.so-master
@@ -250,7 +250,7 @@ http {
         error_page 401 = @error401;
 
         location @error401 {
-          add_header    Set-Cookie "NSREDIRECT=http://{{ masterip }}$request_uri;Domain={{ masterip }};Path=/";
+          add_header    Set-Cookie "NSREDIRECT=http://{{ masterip }}$request_uri;Domain={{ masterip }};Path=/;Max-Age=60000";
           return        302 http://{{ masterip }}/so-auth/loginpage/;
         }
 
diff --git a/salt/common/nginx/nginx.conf.so-mastersearch b/salt/common/nginx/nginx.conf.so-mastersearch
index 6fa080f5b..1bd0ebd2f 100644
--- a/salt/common/nginx/nginx.conf.so-mastersearch
+++ b/salt/common/nginx/nginx.conf.so-mastersearch
@@ -262,7 +262,7 @@ http {
         error_page 401 = @error401;
 
         location @error401 {
-          add_header    Set-Cookie "NSREDIRECT=http://{{ masterip }}$request_uri;Domain={{ masterip }};Path=/";
+          add_header    Set-Cookie "NSREDIRECT=http://{{ masterip }}$request_uri;Domain={{ masterip }};Path=/;Max-Age=60000";
           return        302 http://{{ masterip }}/so-auth/loginpage/;
         }