diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index aad47fccdac..60869d7bd1f 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
-	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/apikeygen"
@@ -71,15 +70,14 @@ func GetContextHandler(ats *auth.UserAuthTokenService) macaron.Handler {
 
 		if rotated {
 			ctx.Logger.Info("new token", "unhashed token", ctx.UserToken.UnhashedToken)
-			//c.SetCookie("grafana_session", url.QueryEscape(ctx.UserToken.UnhashedToken), nil, setting.AppSubUrl+"/", setting.Domain, false, true)
-			// ctx.Resp.Header().Del("Set-Cookie")
+			ctx.Resp.Header().Del("Set-Cookie")
 			cookie := http.Cookie{
 				Name:     "grafana_session",
 				Value:    url.QueryEscape(ctx.UserToken.UnhashedToken),
 				HttpOnly: true,
-				MaxAge:   int(time.Minute * 10),
-				Domain:   setting.Domain,
-				Path:     setting.AppSubUrl + "/",
+				//MaxAge:   600,
+				Domain: setting.Domain,
+				Path:   setting.AppSubUrl + "/",
 			}
 
 			ctx.Resp.Header().Add("Set-Cookie", cookie.String())
diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go
index e393239ef9d..1b2c7307923 100644
--- a/pkg/services/auth/auth_token.go
+++ b/pkg/services/auth/auth_token.go
@@ -46,9 +46,9 @@ func (s *UserAuthTokenService) UserAuthenticatedHook(user *models.User, c *model
 		Name:     sessionCookieKey,
 		Value:    url.QueryEscape(userToken.UnhashedToken),
 		HttpOnly: true,
-		MaxAge:   int(time.Minute * 10),
-		Domain:   setting.Domain,
-		Path:     setting.AppSubUrl + "/",
+		//MaxAge:   600,
+		Domain: setting.Domain,
+		Path:   setting.AppSubUrl + "/",
 	}
 
 	c.Resp.Header().Add("Set-Cookie", cookie.String())