diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index d062222b1c28f256ebaec92c3da4c7fb2bb2793b..d418afda011742afecaa6c502ce09992f88784df 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -1660,7 +1660,13 @@ class SelectionField extends FormField {
             return array($i=>$choices[$i]);
 
         // Query the store by value or extra (abbrv.)
-        if (($list=$this->getList()) && ($i=$list->getItem($value)))
+        if (!($list=$this->getList()))
+            return null;
+
+        if ($i = $list->getItem($value))
+            return array($i->getId() => $i->getValue());
+
+        if ($i = $list->getItem($value, true))
             return array($i->getId() => $i->getValue());
 
         return null;