diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 74b6ef4f36dc113d44b5a8e3c48ce7925e9ee10c..e33d6e207315c1df683d98aa6ee7dcfc541335b8 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -983,10 +983,15 @@ class SelectionField extends FormField {
     }
 
     function to_database($value) {
+        $id = null;
+        if (is_array($value)) {
+            reset($value);
+            $id = key($value);
+        }
         if ($value && is_array($value))
             $value = JsonDataEncoder::encode($value);
 
-        return $value;
+        return array($value, $id);
     }
 
     function to_php($value, $id=false) {