diff --git a/cck/driver/WizardMachine.cpp b/cck/driver/WizardMachine.cpp
index f087337ee678..324e9d90fbe8 100644
--- a/cck/driver/WizardMachine.cpp
+++ b/cck/driver/WizardMachine.cpp
@@ -1436,8 +1436,10 @@ void CWizardMachineApp::GenerateList(CString action, WIDGET* targetWidget, CStri
 	}
 	else if(curWidget->type == "ComboBox")
 	{
-		int selIndex = atoi(curWidget->value);
-		((CComboBox*)curWidget->control)->SetCurSel(selIndex);
+		if (curWidget->value && curWidget->value != "")
+			((CComboBox*)curWidget->control)->SelectString(-1, curWidget->value);
+		else
+			((CComboBox*)curWidget->control)->SetCurSel(0);
 	}
 }
 
diff --git a/cck/driver/WizardUI.cpp b/cck/driver/WizardUI.cpp
index 34e8ad9b0c5d..0fd9cf657267 100644
--- a/cck/driver/WizardUI.cpp
+++ b/cck/driver/WizardUI.cpp
@@ -1207,7 +1207,8 @@ void CWizardUI::UpdateGlobals()
 			**/
 			int selectedIndex = ((CComboBox*)curWidget->control)->GetCurSel();
 			char tmpStr[MIN_SIZE];
-			itoa(selectedIndex, tmpStr, 10);
+			//itoa(selectedIndex, tmpStr, 10);
+			((CComboBox*)curWidget->control)->GetLBText(selectedIndex, tmpStr);
 			curWidget->value = tmpStr;
 
 			/**