diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index da0d735aa..bc0fcbb4f 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2178,11 +2178,14 @@ EOF
 									if ((count($aAllowedValues) == 1) && ($bMandatory == 'true'))
 									{
 										// When there is only once choice, select it by default
-										$oPage->add_ready_script(
-											<<<EOF
+										if($value != $key)
+										{
+											$oPage->add_ready_script(
+												<<<EOF
 $('#$iId').attr('data-validate','dependencies');
 EOF
-										);
+											);
+										}
 										$sSelected = ' selected';
 									}
 									else
diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index fc722ac55..b371d6204 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -208,11 +208,14 @@ class UIExtKeyWidget
 					{
 						// When there is only once choice, select it by default
 						$sSelected = 'selected';
-						$oPage->add_ready_script(
-							<<<EOF
+						if($value != $key)
+						{
+							$oPage->add_ready_script(
+								<<<EOF
 $('#$this->iId').attr('data-validate','dependencies');
 EOF
-						);
+							);
+						}
 					}
 					else
 					{