diff --git a/include/class.forms.php b/include/class.forms.php
index 6e3e39141d92bae69ddf30149be8c67ec2a16907..8a3f5299d1cd7a81fa5d2040f053f0101b1456fc 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;
     }