diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php
index 5ca68e2c3..d25ce4548 100644
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -191,9 +191,6 @@ class CMDBSource
 		$result = self::Query($sSQL);
 		$aRow = mysql_fetch_assoc($result);
 		$iNextInsertId = $aRow['Auto_increment'];
-		echo "<pre>\n";
-		print_r($aRow);
-		echo "</pre>\n";
 		return $iNextInsertId;
 	}
 
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 4461cef6b..9d4365f76 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -84,9 +84,19 @@ switch($operation)
 	}
 	foreach($oWizardHelper->GetFieldsForAllowedValues() as $sAttCode)
 	{
-		// MetaModel::GetAllowedValues_att() => array(id => value)
+		 $aAllowedValues = MetaModel::GetAllowedValues_att(get_class($oObj), $sAttCode, array('this' => $oObj));
+		// Few choices, use a normal 'select'
+		$sHTMLValue = "<select name=\"attr_{$sAttCode}\"\n";
+		$sHTMLValue .= "<option value=\"0\">-- select one --</option>\n";
+		foreach($aAllowedValues as $key => $display_value)
+		{
+			$sSelected = ''; //($value == $key) ? ' selected' : '';
+			$sHTMLValue .= "<option value=\"$key\"$sSelected>$display_value</option>\n";
+		}
+		$sHTMLValue .= "</select>\n";
+
 		// Improvement: what if the list is too long?
-		$oWizardHelper->SetAllowedValuesHtml($sAttCode, "Possible values ($sAttCode)");
+		$oWizardHelper->SetAllowedValuesHtml($sAttCode, $sHTMLValue);
 	}
 	$oPage->add($oWizardHelper->ToJSON());
 	break;