diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index 0404442..535066f 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -734,8 +734,8 @@ Public Class frmMain
 
                 ' this needs to stay for backwards compatibility
                 sql = sql.Replace("@USER_ID", USER_ID)
-                sql = sql.Replace("@USERNAME", Environment.UserName)
-                sql = sql.Replace("@MACHINE_NAME", Environment.MachineName)
+                sql = sql.Replace("@USERNAME", Environment.UserName) '{#INT#USERNAME}
+                sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) '{#INT#machineName}
                 sql = sql.Replace("@DATE", Now.ToShortDateString)
                 sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID)