diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index be7fde5d874..1fee8da7b47 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3880,7 +3880,7 @@ class Form
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid)
+					if ($selected == $obj->rowid || ($num === 1  && empty($selected)))
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
 					} else {