diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java b/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java
index cb1b0c23ae7..c596e23be83 100644
--- a/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java
+++ b/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java
@@ -18,7 +18,7 @@
  */
 public class PageConfig {
 
-    public static int WAIT_OPERATION_TIMEOUT = 60;
+    public static int WAIT_OPERATION_TIMEOUT = 30;
 
     private final WebDriver driver;
     private final Map<String, String> testKeys = new HashMap<>();
diff --git a/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlOperationServiceImpl.java b/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlOperationServiceImpl.java
index 9f9a1f0dfd2..020994c3856 100644
--- a/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlOperationServiceImpl.java
+++ b/jans-orm/sql/src/main/java/io/jans/orm/sql/operation/impl/SqlOperationServiceImpl.java
@@ -16,6 +16,7 @@
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -659,6 +660,9 @@ private List<AttributeData> getAttributeDataList(TableMapping tableMapping, Resu
 					} else if (attributeObject instanceof Timestamp) {
 						attributeValueObjects = new Object[] {
 								new java.util.Date(((Timestamp) attributeObject).getTime()) };
+					} else if (attributeObject instanceof LocalDateTime) {
+						attributeValueObjects = new Object[] {
+								new java.util.Date(Timestamp.valueOf((LocalDateTime) attributeObject).getTime()) };
 					} else {
 						Object value = attributeObject.toString();
 						attributeValueObjects = new Object[] { value };