diff --git a/BimServer/src/org/bimserver/database/actions/LoginUserTokenDatabaseAction.java b/BimServer/src/org/bimserver/database/actions/LoginUserTokenDatabaseAction.java
index <HASH>..<HASH> 100644
--- a/BimServer/src/org/bimserver/database/actions/LoginUserTokenDatabaseAction.java
+++ b/BimServer/src/org/bimserver/database/actions/LoginUserTokenDatabaseAction.java
@@ -64,9 +64,9 @@ public class LoginUserTokenDatabaseAction extends BimDatabaseAction<String> {
 			}
 			Authorization authorization = null;
 			if (user.getUserType() == UserType.ADMIN) {
-				authorization = new AdminAuthorization(30, TimeUnit.DAYS);
+				authorization = new AdminAuthorization(bimServer.getServerSettingsCache().getServerSettings().getSessionTimeOutSeconds(), TimeUnit.SECONDS);
 			} else {
-				authorization = new UserAuthorization(30, TimeUnit.DAYS);
+				authorization = new UserAuthorization(bimServer.getServerSettingsCache().getServerSettings().getSessionTimeOutSeconds(), TimeUnit.SECONDS);
 			}
 			authorization.setUoid(user.getOid());
 			String asHexToken = authorization.asHexToken(bimServer.getEncryptionKey());
Added sessionTimeOutSeconds