diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 9d80dc2d22a..6a71c52cf54 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -343,6 +343,8 @@ class Conf
 		// Defini MAIN_GRAPH_LIBRARY
 		if (empty($this->global->MAIN_GRAPH_LIBRARY)) $this->global->MAIN_GRAPH_LIBRARY = 'artichow';
 
+        if (! isset($this->global->MAIN_MAIL_EMAIL_INLINE_IMAGES)) $this->global->MAIN_MAIL_EMAIL_INLINE_IMAGES=1;
+
         // Format for date (used by default when not found or searched in lang)
         $this->format_date_short="%d/%m/%Y";            # Format of day with PHP/C tags (strftime functions)
         $this->format_date_short_java="dd/MM/yyyy";     # Format of day with Java tags
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2e66b1f25ca..d8b231579e8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2953,7 +2953,7 @@ class Form
             $no="0";
         }
 
-        $resultyesno = '<select class="flat" name="'.$htmlname.'">'."\n";
+        $resultyesno = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">'."\n";
         if (("$value" == 'yes') || ($value == 1))
         {
             $resultyesno .= '<option value="'.$yes.'" selected="selected">'.$langs->trans("Yes").'</option>'."\n";