diff --git a/org.adempiere.base.process/src/org/compiere/process/CopyRole.java b/org.adempiere.base.process/src/org/compiere/process/CopyRole.java
index bcf9344d65..f16ef59861 100755
--- a/org.adempiere.base.process/src/org/compiere/process/CopyRole.java
+++ b/org.adempiere.base.process/src/org/compiere/process/CopyRole.java
@@ -108,8 +108,8 @@ public class CopyRole extends SvrProcess
 				sql.append(") ");
 			sql.append("SELECT ").append(m_AD_Client_ID)
 				.append(", ").append(m_AD_Org_ID)
-				.append(", getdate(), ").append(Env.getAD_User_ID(Env.getCtx()))
-				.append(", getdate(), ").append(Env.getAD_User_ID(Env.getCtx()))
+				.append(", SYSDATE, ").append(Env.getAD_User_ID(Env.getCtx()))
+				.append(", SYSDATE, ").append(Env.getAD_User_ID(Env.getCtx()))
 				.append(", ").append(m_AD_Role_ID_To)
 				.append(", ").append(keycolumn)
 				.append(", IsActive ");
diff --git a/org.adempiere.base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java
index 93a8ee1f4d..72b596082e 100644
--- a/org.adempiere.base/src/org/compiere/model/MRole.java
+++ b/org.adempiere.base/src/org/compiere/model/MRole.java
@@ -2778,9 +2778,10 @@ public final class MRole extends X_AD_Role
 		+" SELECT 1 FROM AD_User_Roles ur"
 		+" INNER JOIN AD_User_Substitute us ON (us.AD_User_ID=ur.AD_User_ID)"
 		+" WHERE ur.AD_Role_ID=AD_Role.AD_Role_ID AND ur.IsActive='Y' AND us.IsActive='Y'"
-		+" AND (us.ValidFrom IS NULL OR us.ValidFrom <= getdate())"
-		+" AND (us.ValidTo IS NULL OR us.ValidTo >= getdate())"
+		+" AND (us.ValidFrom IS NULL OR us.ValidFrom <= SYSDATE)"
+		+" AND (us.ValidTo IS NULL OR us.ValidTo >= SYSDATE)"
 		+" AND us.Substitute_ID=?)";
+
 		List<MRole> list = new Query(getCtx(), Table_Name, whereClause, get_TrxName())
 		.setParameters(new Object[]{AD_User_ID})
 		.setClient_ID()