diff --git a/pages/UI.php b/pages/UI.php
index b31d7279a6..6ce1fd6720 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -920,9 +920,8 @@ try
 		else
 		{
 			$oObj = MetaModel::NewObject($sClass);
-			foreach(MetaModel::GetZListItems($sClass, 'details') as $sAttCode)
+			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 			{
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 				if ($oAttDef->IsLinkSet())
 				{
 					// Link set, the data is a set of link objects, encoded in JSON
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index d993d9153d..3ab4346ed3 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -121,7 +121,8 @@ switch($operation)
 			$displayValue = $oObj->GetEditValue($sAttCode);
 			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 			$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $value, $displayValue, $sId, '', 0, array('this' => $oObj));
-	
+			// Make sure that we immediatly validate the field when we reload it
+			$oPage->add_ready_script("$('#$sId').trigger('validate');");
 			$oWizardHelper->SetAllowedValuesHtml($sAttCode, $sHTMLValue);
 		}
 	}