diff --git a/include/class.forms.php b/include/class.forms.php
index 6452059a82c0f340192be94dc9587217cc60c52c..e13f5f15d41a0c28bebb7d7e8a1108a247d4d241 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -1847,9 +1847,9 @@ class ChoiceField extends FormField {
         if ($value && is_array($value)) {
             $selection = $value;
         } elseif (isset($choices[$value]))
-            $selection[] = $choices[$value];
-        elseif ($this->get('default'))
-            $selection[] = $choices[$this->get('default')];
+            $selection[$value] = $choices[$value];
+        elseif (($v=$this->get('default')) && isset($choices[$v]))
+            $selection[$v] = $choices[$v];
 
         return $selection;
     }