diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f8ae5c17155..f031e575b67 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -293,19 +293,23 @@ class Form
                     $obj = $this->db->fetch_object($resql);
                     $countryArray[$i]['rowid'] 		= $obj->rowid;
                     $countryArray[$i]['code_iso'] 	= $obj->code_iso;
-                    $countryArray[$i]['label']		= ($obj->code_iso && $langs->trans("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->trans("Country".$obj->code_iso):($obj->label!='-'?$obj->label:''));
+                    $countryArray[$i]['label']		= ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:''));
                 	$label[$i] 	= $countryArray[$i]['label'];
                     $i++;
                 }
 
                 array_multisort($label, SORT_ASC, $countryArray);
-
+                
                 foreach ($countryArray as $row)
                 {
-                	if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['label']) ) {
-                        $foundselected=true;
+					//print 'rr'.$selected.'-'.$row['label'].'-'.$row['code_iso'].'<br>';
+                	if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['label']) ) 
+                	{
+                		$foundselected=true;
                         $out.= '<option value="'.$row['rowid'].'" selected="selected">';
-                    } else {
+                    }
+                    else
+                    {
                         $out.= '<option value="'.$row['rowid'].'">';
                     }
                     $out.= $row['label'];