diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java
index 5dd3ca61d5..06cc57f6d4 100644
--- a/org.adempiere.base/src/org/compiere/util/Env.java
+++ b/org.adempiere.base/src/org/compiere/util/Env.java
@@ -1738,6 +1738,8 @@ public final class Env
 					outStr.append("@").append(token);
 					if (!Util.isEmpty(format))
 						outStr.append("<").append(format).append(">");
+					if (!Util.isEmpty(defaultValue))
+	                    outStr.append(":").append(defaultValue);
 					outStr.append("@");
 				}
 			} else if (po != null && token.startsWith("=")) {
@@ -1759,6 +1761,8 @@ public final class Env
 						outStr.append("@").append(token);
 						if (!Util.isEmpty(format))
 							outStr.append("<").append(format).append(">");
+						if (!Util.isEmpty(defaultValue))
+		                    outStr.append(":").append(defaultValue);
 						outStr.append("@");
 					}
 				}
@@ -1776,6 +1780,8 @@ public final class Env
 					outStr.append("@").append(token);
 					if (!Util.isEmpty(format))
 						outStr.append("<").append(format).append(">");
+					if (!Util.isEmpty(defaultValue))
+	                    outStr.append(":").append(defaultValue);
 					outStr.append("@");
 				}
 			}