diff --git a/Export/Formatter/CSVFormatter.php b/Export/Formatter/CSVFormatter.php
index c58d24fec..a270d8978 100644
--- a/Export/Formatter/CSVFormatter.php
+++ b/Export/Formatter/CSVFormatter.php
@@ -122,6 +122,7 @@ class CSVFormatter implements FormatterInterface
                  range(1, $nbAggregators),
                  range(1, $nbAggregators)
                  ),
+           'choices_as_values' => true,
            'multiple' => false,
            'expanded' => false
         ));
diff --git a/Export/Formatter/SpreadSheetFormatter.php b/Export/Formatter/SpreadSheetFormatter.php
index 71037f5bd..cda326815 100644
--- a/Export/Formatter/SpreadSheetFormatter.php
+++ b/Export/Formatter/SpreadSheetFormatter.php
@@ -194,6 +194,7 @@ class SpreadSheetFormatter implements FormatterInterface
                  range(1, $nbAggregators),
                  range(1, $nbAggregators)
                  ),
+           'choices_as_values' => true,
            'multiple' => false,
            'expanded' => false
         ));
diff --git a/Form/Type/AppendScopeChoiceTypeTrait.php b/Form/Type/AppendScopeChoiceTypeTrait.php
index 77c937645..584d8cfcd 100644
--- a/Form/Type/AppendScopeChoiceTypeTrait.php
+++ b/Form/Type/AppendScopeChoiceTypeTrait.php
@@ -121,7 +121,8 @@ trait AppendScopeChoiceTypeTrait
                     $form->add(
                             $builder
                             ->create($name, ChoiceType::class, array(
-                                'choices' => $choices,
+                                'choices' => array_combine(array_values($choices),array_keys($choices)),
+                                'choices_as_values' => true,
                                 'auto_initialize' => false
                                 )
                             )
diff --git a/Form/Type/ComposedRoleScopeType.php b/Form/Type/ComposedRoleScopeType.php
index e26edfcfb..e3554a126 100644
--- a/Form/Type/ComposedRoleScopeType.php
+++ b/Form/Type/ComposedRoleScopeType.php
@@ -90,7 +90,8 @@ class ComposedRoleScopeType extends AbstractType
 
         $builder
             ->add('role', ChoiceType::class, array(
-               'choices' => $values,
+               'choices' => array_combine(array_values($values),array_keys($values)),
+               'choices_as_values' => true,
                'placeholder' => 'Choose amongst roles',
                'choice_attr' => function($role) use ($rolesWithoutScopes) {
                     if (in_array($role, $rolesWithoutScopes)) {
diff --git a/Form/Type/Export/PickFormatterType.php b/Form/Type/Export/PickFormatterType.php
index 88a0b7ba8..8ac039c34 100644
--- a/Form/Type/Export/PickFormatterType.php
+++ b/Form/Type/Export/PickFormatterType.php
@@ -54,7 +54,7 @@ class PickFormatterType extends AbstractType
         }
 
         $builder->add('alias', ChoiceType::class, array(
-            'choices' => $choices,
+            'choices' => array_combine(array_values($choices),array_keys($choices)),
             'choices_as_values' => true,
             'multiple' => false
         ));