diff --git a/Controller/CustomFieldsGroupController.php b/Controller/CustomFieldsGroupController.php
index 69e6586b6..7f6318d20 100644
--- a/Controller/CustomFieldsGroupController.php
+++ b/Controller/CustomFieldsGroupController.php
@@ -254,7 +254,8 @@ class CustomFieldsGroupController extends Controller
                     'csrf_protection' => false
                     ))
               ->add('type', ChoiceType::class, array(
-                    'choices' => $fieldChoices
+                    'choices' => array_combine(array_values($fieldChoices),array_keys($fieldChoices)),
+                    'choices_as_values' => true
                    ))
               ->add('customFieldsGroup', HiddenType::class)
               ->add('submit', SubmitType::class);
diff --git a/CustomFields/CustomFieldChoice.php b/CustomFields/CustomFieldChoice.php
index d04706c38..6738b32c8 100644
--- a/CustomFields/CustomFieldChoice.php
+++ b/CustomFields/CustomFieldChoice.php
@@ -124,8 +124,9 @@ class CustomFieldChoice extends AbstractCustomField
                 'expanded' => true,
                 'multiple' => false,
                 'choices' => array(
-                    '1' => 'Multiple',
-                    '0' => 'Unique'),
+                    'Multiple' => '1',
+                    'Unique' => '0'),
+                'choices_as_values' => true,
                 'empty_data' => '0',
                 'label' => 'Multiplicity'
                 ))
@@ -133,16 +134,18 @@ class CustomFieldChoice extends AbstractCustomField
                 'expanded' => true,
                 'multiple' => false,
                 'choices' => array(
-                    '1' => 'Expanded',
-                    '0' => 'Non expanded'),
+                    'Expanded' => '1',
+                    'Non expanded' => '0'),
+                'choices_as_values' => true,
                 'empty_data' => '0',
                 'label' => 'Choice display'
                 ))
             ->add(self::ALLOW_OTHER, ChoiceType::class, array(
                 'label' => 'Allow other',
                 'choices' => array(
-                    '0' => 'No',
-                    '1' => 'Yes'),
+                    'No' => '0',
+                    'Yes' => '1'),
+                'choices_as_values' => true,
                 'empty_data' => '0',
                 'expanded' => true,
                 'multiple' => false
diff --git a/CustomFields/CustomFieldLongChoice.php b/CustomFields/CustomFieldLongChoice.php
index cd6159666..3f9dfaadb 100644
--- a/CustomFields/CustomFieldLongChoice.php
+++ b/CustomFields/CustomFieldLongChoice.php
@@ -111,8 +111,9 @@ class CustomFieldLongChoice extends AbstractCustomField
         }
 
         return $builder->add(self::KEY, ChoiceType::class, array(
-            'choices' => $choices,
-            'label' => 'Options key'
+            'choices' => array_combine(array_values($choices),array_keys($choices)),
+            'label' => 'Options key',
+            'choices_as_values' => true
         ));
 
     }
diff --git a/CustomFields/CustomFieldText.php b/CustomFields/CustomFieldText.php
index 663168ffc..41c925b2d 100644
--- a/CustomFields/CustomFieldText.php
+++ b/CustomFields/CustomFieldText.php
@@ -124,9 +124,10 @@ class CustomFieldText extends AbstractCustomField
             ->add(self::MAX_LENGTH, 'integer', array('empty_data' => 256))
             ->add(self::MULTIPLE_CF_INLINE, ChoiceType::class,  array(
                 'choices'  => array(
-                   '1' => 'Multiple boxes on the line',
-                   '0' => 'One box on the line'
+                   'Multiple boxes on the line' => '1',
+                   'One box on the line' => '0'
                    ),
+                'choices_as_values' => true,
                 'label' => 'Box appearance',
                 'expanded' => True
                ))
diff --git a/CustomFields/CustomFieldTitle.php b/CustomFields/CustomFieldTitle.php
index 85c50fdf2..319f899c3 100644
--- a/CustomFields/CustomFieldTitle.php
+++ b/CustomFields/CustomFieldTitle.php
@@ -104,10 +104,11 @@ class CustomFieldTitle extends AbstractCustomField
         return $builder->add(self::TYPE, ChoiceType::class,
             array(
                'choices' => array(
-                    self::TYPE_TITLE => 'Main title',
-                    self::TYPE_SUBTITLE => 'Subtitle'
+                    'Main title' => self::TYPE_TITLE,
+                    'Subtitle' => self::TYPE_SUBTITLE 
                 ),
-               'label' => 'Title level'
+               'label' => 'Title level',
+               'choices_as_values' => true
             )
         );
     }
diff --git a/Form/CustomFieldsGroupType.php b/Form/CustomFieldsGroupType.php
index eba1804e1..3be8b538d 100644
--- a/Form/CustomFieldsGroupType.php
+++ b/Form/CustomFieldsGroupType.php
@@ -47,7 +47,8 @@ class CustomFieldsGroupType extends AbstractType
         $builder
             ->add('name', 'translatable_string')
             ->add('entity', ChoiceType::class, array(
-                'choices' => $entities
+                'choices' => array_combine(array_values($entities),array_keys($entities)),
+                'choices_as_values' => true
             ))
         ;