diff --git a/libraries/config.values.php b/libraries/config.values.php
index f7978210e..e79ef04e5 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -83,6 +83,7 @@ $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
     'yaml');
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
+$cfg_db['Export']['codegen_format'] = array('#', 'NHibernate C# DO', 'NHibernate XML');
 
 /**
  * Default values overrides
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 4eff1d13a..62b23e0c4 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -512,7 +512,7 @@ class ConfigFile
             // string keys: $cfg[key][subkey] = value
             foreach ($var_value as $k => $v) {
                 $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-                $ret = "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
+                $ret .= "\$cfg['$var_name']['$k'] = " . var_export($v, true) . ';' . $crlf;
             }
         }
         return $ret;
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index c0d4db086..6e2f99474 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -88,7 +88,13 @@ class Form
             trigger_error("$option_path - not a static value list", E_USER_ERROR);
             return array();
         }
-        return $value;
+        // convert value list array('a', 'b') to array('a' => 'a', 'b' => 'b')
+        // and array('#', 'a', 'b') to array('a', 'b')
+        if ($value[0] == '#') {
+            array_shift($value);
+            return $value;
+        }
+        return array_combine($value, $value);
     }
 
     /**
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index be643ac48..4e3f8d586 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -320,11 +320,7 @@ class FormDisplay
                 break;
             case 'select':
                 $type = 'select';
-                $opts['values'] = array();
-                $values = $form->getOptionValueList($form->fields[$field]);
-                foreach ($values as $v) {
-                    $opts['values'][$v] = $v;
-                }
+                $opts['values'] = $form->getOptionValueList($form->fields[$field]);
                 break;
             case 'array':
                 $type = 'list';
@@ -508,7 +504,7 @@ class FormDisplay
                         }
                         break;
                     case 'select':
-                        if (!$this->_validateSelect($_POST[$key], $form->getOptionValueList($system_path))) {
+                        if (!$this->_validateSelect($_POST[$key], array_keys($form->getOptionValueList($system_path)))) {
                             $this->errors[$work_path][] = __('Incorrect value');
                             $result = false;
                             continue;