diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
index 08c4cf9bd6..406ebfb743 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
@@ -18,6 +18,7 @@
 package org.adempiere.webui.editor;
 
 import java.sql.Timestamp;
+import java.time.ZoneId;
 import java.util.Date;
 
 import org.adempiere.webui.ValuePreference;
@@ -120,7 +121,7 @@ public class WDateEditor extends WEditor implements ContextMenuListener
 
 	        if (date != null)
 	        {
-	            newValue = new Timestamp(date.getTime());
+	        	newValue = Timestamp.valueOf(date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
 	        }
 	        if (oldValue != null && newValue != null && oldValue.equals(newValue)) {
 	    	    return;
@@ -147,7 +148,7 @@ public class WDateEditor extends WEditor implements ContextMenuListener
     {
     	// Elaine 2008/07/25
     	if(getComponent().getValue() == null) return null;
-    	return new Timestamp(getComponent().getValue().getTime());
+    	return Timestamp.valueOf(getComponent().getValue().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
     	//
     }
 
@@ -161,7 +162,7 @@ public class WDateEditor extends WEditor implements ContextMenuListener
     	}
     	else if (value instanceof Timestamp)
         {
-            getComponent().setValue((Timestamp)value);
+            getComponent().setValueInLocalDateTime(((Timestamp)value).toLocalDateTime());
             oldValue = (Timestamp)value;
         }
     	else
@@ -171,7 +172,7 @@ public class WDateEditor extends WEditor implements ContextMenuListener
     			getComponent().setText(value.toString());
     		} catch (Exception e) {}
     		if (getComponent().getValue() != null)
-    			oldValue = new Timestamp(getComponent().getValue().getTime());
+    			oldValue = Timestamp.valueOf(getComponent().getValue().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
     		else
     			oldValue = null;
     	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
index 7876aeba27..d45f3ef4b0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
@@ -13,6 +13,7 @@
 package org.adempiere.webui.editor;
 
 import java.sql.Timestamp;
+import java.time.ZoneId;
 import java.util.Date;
 
 import org.adempiere.webui.ValuePreference;
@@ -115,7 +116,7 @@ public class WDatetimeEditor extends WEditor implements ContextMenuListener
 
 	        if (date != null)
 	        {
-	            newValue = new Timestamp(date.getTime());
+	            newValue = Timestamp.valueOf(date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
 	        }
 	        if (oldValue != null && newValue != null && oldValue.equals(newValue)) {
 	    	    return;
@@ -142,7 +143,7 @@ public class WDatetimeEditor extends WEditor implements ContextMenuListener
     {
     	// Elaine 2008/07/25
     	if(getComponent().getValue() == null) return null;
-    	return new Timestamp(getComponent().getValue().getTime());
+    	return Timestamp.valueOf(getComponent().getDatebox().getValue().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
     	//
     }
 
@@ -156,7 +157,7 @@ public class WDatetimeEditor extends WEditor implements ContextMenuListener
     	}
     	else if (value instanceof Timestamp)
         {
-            getComponent().setValue((Timestamp)value);
+    		getComponent().getDatebox().setValueInLocalDateTime(((Timestamp)value).toLocalDateTime());
             oldValue = (Timestamp)value;
         }
     	else
@@ -166,7 +167,7 @@ public class WDatetimeEditor extends WEditor implements ContextMenuListener
     			getComponent().setText(value.toString());
     		} catch (Exception e) {}
     		if (getComponent().getValue() != null)
-    			oldValue = new Timestamp(getComponent().getValue().getTime());
+    			oldValue = Timestamp.valueOf(getComponent().getDatebox().getValue().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
     		else
     			oldValue = null;
     	}