diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
index 6d08acb0c..50d5e12dd 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java
@@ -20,7 +20,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Timestamp;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.*;
 
 public abstract class AbstractAuthenticationService implements AuthenticationService {
@@ -98,7 +100,7 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 
 		UserToken userToken = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserTokenBuilder.class)
 				.issuedAt(new Date()).user(credential.getUserInfo())
-				.token(UUID.randomUUID()).expiresAt(addADay(new Date()))
+				.token(UUID.randomUUID()).expiresAt(Timestamp.valueOf(LocalDateTime.now().plusDays(1)))
 				.build();
 
 		userToken = apiContext.getOperationsContext().getDatabaseRepository().getUserTokenDao().createOrUpdate(userToken);
@@ -187,7 +189,7 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer
 
 		UserToken userToken = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserTokenBuilder.class)
 				.token(UUID.randomUUID()).user(userInfo)
-				.expiresAt(addADay(new Date())).issuedAt(new Date())
+				.expiresAt(Timestamp.valueOf(LocalDateTime.now().plusDays(1))).issuedAt(new Date())
 				.build();
 
 		apiContext.getOperationsContext().getDatabaseRepository().getUserTokenDao().createOrUpdate(userToken);