diff --git a/mozilla/cck/driver/WizardUI.cpp b/mozilla/cck/driver/WizardUI.cpp
index 9ccaf1fe244..dfefc24b990 100644
--- a/mozilla/cck/driver/WizardUI.cpp
+++ b/mozilla/cck/driver/WizardUI.cpp
@@ -572,7 +572,7 @@ BOOL CWizardUI::NewConfig(WIDGET *curWidget, CString globalsName)
 		return FALSE;
 
 	CString tmpFunction = tmpWidget->action.function;
-	CString params = CString(tmpWidget->action.parameters);
+	CString params = theInterpreter->replaceVars(tmpWidget->action.parameters,NULL);
 	theApp.GenerateList(tmpFunction, tmpWidget, params);	
 					
 	((CComboBox*)tmpWidget->control)->SelectString(0, configField);
diff --git a/mozilla/cck/driver/interpret.cpp b/mozilla/cck/driver/interpret.cpp
index 5e56853de31..7ceb1b09e38 100644
--- a/mozilla/cck/driver/interpret.cpp
+++ b/mozilla/cck/driver/interpret.cpp
@@ -440,7 +440,10 @@ BOOL CInterpret::interpret(CString cmds, WIDGET *curWidget)
 						w = theApp.findWidget(parms);
 
 					if (w)
-						theApp.GenerateList(pcmd, w, p2);
+					{
+						CString p2path = replaceVars(p2,NULL);
+						theApp.GenerateList(pcmd, w, p2path);
+					}
 				}
 				else if (strcmp(pcmd, "BrowseFile") == 0)
 				{