diff --git a/trunk/application/cmdbabstract.class.inc.php b/trunk/application/cmdbabstract.class.inc.php
index bc1008ed3..3f9a3cd00 100644
--- a/trunk/application/cmdbabstract.class.inc.php
+++ b/trunk/application/cmdbabstract.class.inc.php
@@ -645,13 +645,13 @@ abstract class cmdbAbstractObject extends CMDBObject
 						//Enum field or external key, display a combo
 						if (count($aAllowedValues) == 0)
 						{
-							$sHTMLValue = "<input type=\"text\" size=\"30\" value=\"\" name=\"attr_{$sAttCode}{$sNameSuffix}\" id=\"$iInputId\"{$sCSSClasses}/>";
+							$sHTMLValue = "<input count=\"0\" type=\"text\" size=\"30\" value=\"\" name=\"attr_{$sAttCode}{$sNameSuffix}\" id=\"$iInputId\"{$sCSSClasses}/>";
 						}
 						else if (count($aAllowedValues) > 50)
 						{
 							// too many choices, use an autocomplete
 							// The input for the auto complete
-							$sHTMLValue = "<input type=\"text\" id=\"label_$iInputId\" size=\"30\" name=\"\" value=\"$sDisplayValue\"{$sCSSClasses}/>";
+							$sHTMLValue = "<input count=\"".count($aAllowedValues)."\" type=\"text\" id=\"label_$iInputId\" size=\"30\" name=\"\" value=\"$sDisplayValue\"{$sCSSClasses}/>";
 							// another hidden input to store & pass the object's Id
 							$sHTMLValue .= "<input type=\"hidden\" id=\"$iInputId\" name=\"attr_{$sAttCode}{$sNameSuffix}\" value=\"$value\" />\n";
 							$oPage->add_ready_script("\$('#label_$iInputId').autocomplete('./ajax.render.php', { minChars:3, onItemSelect:selectItem, onFindValue:findValue, formatItem:formatItem, autoFill:true, keyHolder:'#$iInputId', extraParams:{operation:'autocomplete', sclass:'$sClass',attCode:'".$sAttCode."'}});");
diff --git a/trunk/js/wizardhelper.js b/trunk/js/wizardhelper.js
index 13f0e78e9..3a3d870d8 100644
--- a/trunk/js/wizardhelper.js
+++ b/trunk/js/wizardhelper.js
@@ -108,7 +108,7 @@ function WizardHelper(sClass)
 				$('body').append(html);
 				//console.log('data received:', oWizardHelper);
 				//oWizardHelper.FromJSON(json_data);
-				oWizardHelper.UpdateFields();
+				//oWizardHelper.UpdateFields(); // Is done directly in the html provided by ajax.render.php
 				//console.log(oWizardHelper);
 				$('#wizStep'+ G_iCurrentStep).unblock( {fadeOut: 0} );
 			});
diff --git a/trunk/pages/ajax.render.php b/trunk/pages/ajax.render.php
index 0edce8c5e..c3d783340 100644
--- a/trunk/pages/ajax.render.php
+++ b/trunk/pages/ajax.render.php
@@ -94,7 +94,7 @@ switch($operation)
 
 		$oWizardHelper->SetAllowedValuesHtml($sAttCode, $sHTMLValue);
 	}
-	$oPage->add("<script type=\"text/javascript\">\noWizardHelper.m_oData=".$oWizardHelper->ToJSON().";\n</script>\n");
+	$oPage->add("<script type=\"text/javascript\">\noWizardHelper.m_oData=".$oWizardHelper->ToJSON().";\noWizardHelper.UpdateFields();\n</script>\n");
 	break;
 		
 	case 'ajax':