diff --git a/src/Chill/CustomFieldsBundle/Form/CustomFieldType.php b/src/Chill/CustomFieldsBundle/Form/CustomFieldType.php
index da926b4a7..28f5a34ae 100644
--- a/src/Chill/CustomFieldsBundle/Form/CustomFieldType.php
+++ b/src/Chill/CustomFieldsBundle/Form/CustomFieldType.php
@@ -62,7 +62,11 @@ class CustomFieldType extends AbstractType
         $resolver->setDefaults(array(
             'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomField'
         )); 
-        $resolver->addAllowedTypes(array('type' => 'string'));
+        
+        $resolver->setRequired(array('type'))
+              ->addAllowedValues(array('type' => 
+                 array_keys($this->customFieldProvider->getAllFields())
+              ));
     }
 
     /**