diff --git a/4dev/database/function/update_function.sql b/4dev/database/function/update_function.sql
index f1c0fcff..e5f1ed50 100644
--- a/4dev/database/function/update_function.sql
+++ b/4dev/database/function/update_function.sql
@@ -4,10 +4,10 @@
 CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS '
 	BEGIN
 		IF TG_OP = ''INSERT'' THEN
-			NEW.date_created := ''now'';
+			NEW.date_created := clock_timestamp();
 			NEW.user_created := current_user;
 		ELSIF TG_OP = ''UPDATE'' THEN
-			NEW.date_updated := ''now'';
+			NEW.date_updated := clock_timestamp();
 			NEW.user_updated := current_user;
 		END IF;
 		RETURN NEW;
diff --git a/4dev/database/table/edit_generic.sql b/4dev/database/table/edit_generic.sql
index 6b0ef0c5..56f3fb97 100644
--- a/4dev/database/table/edit_generic.sql
+++ b/4dev/database/table/edit_generic.sql
@@ -9,7 +9,7 @@
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
 	eg_status	INT,
-	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
 	date_updated	TIMESTAMP WITHOUT TIME ZONE,
 	user_created	VARCHAR(25) DEFAULT CURRENT_USER,
 	user_updated	VARCHAR(25)
diff --git a/4dev/database/table/generic.sql b/4dev/database/table/generic.sql
index b0e1b182..84eaef7d 100644
--- a/4dev/database/table/generic.sql
+++ b/4dev/database/table/generic.sql
@@ -9,7 +9,7 @@
 -- DROP TABLE edit_generic;
 CREATE TABLE generic (
 	row_status	INT,
-	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
 	date_updated	TIMESTAMP WITHOUT TIME ZONE,
 	user_created	VARCHAR(25) DEFAULT CURRENT_USER,
 	user_updated	VARCHAR(25)