diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index 3bfb409e9..bd5c1ece5 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -58,13 +58,14 @@ services:
         arguments:
             - "@chill.main.helper.translatable_string"
             - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
-            - '@chill.main.form.choice_loader.postal_code'
+            - '@Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader'
             - '@Symfony\Component\Translation\TranslatorInterface'
         tags:
             - { name: form.type }
 
-    chill.main.form.choice_loader.postal_code:
-        class: Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader
+    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader:
+        autowire: true
+        autoconfigure: true
 
     chill.main.form.type.export:
         class: Chill\MainBundle\Form\Type\Export\ExportType