diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java
index 63313f4c..705555cf 100644
--- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java
+++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java
@@ -24,6 +24,7 @@ import java.util.List;
 import javax.servlet.Filter;
 
 import org.maxkey.constants.ConstantsProperties;
+import org.maxkey.constants.ConstantsTimeInterval;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -70,7 +71,7 @@ public class MvcAutoConfiguration implements InitializingBean {
         CookieLocaleResolver cookieLocaleResolver = new CookieLocaleResolver();
         cookieLocaleResolver.setCookieName("maxkey_lang");
         cookieLocaleResolver.setCookieDomain(domainName);
-        cookieLocaleResolver.setCookieMaxAge(604800);
+        cookieLocaleResolver.setCookieMaxAge(ConstantsTimeInterval.TWO_WEEK);
         return cookieLocaleResolver;
     }
     
diff --git a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java
index bb57945b..6b045ddd 100644
--- a/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java
+++ b/maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java
@@ -70,6 +70,9 @@ public class ApplicationConfig {
 
     @Value("${server.port:8080}")
     private int port;
+    
+    @Value("${server.servlet.session.timeout:1800}")
+    private int sessionTimeout;
 
     @Value("${config.identity.kafkasupport:false}")
     private boolean kafkaSupport;
@@ -196,7 +199,15 @@ public class ApplicationConfig {
         this.maxKeyUri = maxKeyUri;
     }
 
-    @Override
+    public int getSessionTimeout() {
+		return sessionTimeout;
+	}
+
+	public void setSessionTimeout(int sessionTimeout) {
+		this.sessionTimeout = sessionTimeout;
+	}
+
+	@Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("ApplicationConfig [emailConfig=");
diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java
index d9fdb3cd..ba06114e 100644
--- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java
+++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java
@@ -87,7 +87,9 @@ public class LoginEndpoint {
 		if(isAuthenticated){
 			return  WebContext.redirect("/forwardindex");
 		}
-				
+		
+		_logger.trace("Session Timeout MaxInactiveInterval " + WebContext.getRequest().getSession().getMaxInactiveInterval());
+		
 		//for normal login
 		ModelAndView modelAndView = new ModelAndView("login");
 		modelAndView.addObject("isRemeberMe", applicationConfig.getLoginConfig().isRemeberMe());
diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties
index c2610e4f..7c5a1eed 100644
--- a/maxkey-web-maxkey/src/main/resources/application.properties
+++ b/maxkey-web-maxkey/src/main/resources/application.properties
@@ -7,6 +7,8 @@ application.formatted-version=v2.6.0 GA
 #server port
 #server.port=80
 server.port=443
+#session default 1800
+server.servlet.session.timeout=1800
 
 #ssl
 server.ssl.key-store=maxkeyserver.keystore