diff --git a/pillar/application/utils/authentication.py b/pillar/application/utils/authentication.py
index 13db1c56..7d676fd0 100644
--- a/pillar/application/utils/authentication.py
+++ b/pillar/application/utils/authentication.py
@@ -109,7 +109,7 @@ def validate_token():
             user_id=user_id,
             token=token,
             groups=groups,
-            token_expire_time=datetime.now() + timedelta(hours=1))
+            token_expire_time=token_data['expire_time'])
     else:
         log.debug("User is already in our database and token hasn't expired yet.")
         users = app.data.driver.db['users']