diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
index 17584f00bf..6da6a002f6 100644
--- a/src/Symfony/Component/Form/FormFactory.php
+++ b/src/Symfony/Component/Form/FormFactory.php
@@ -123,6 +123,10 @@ class FormFactory implements FormFactoryInterface
         $knownOptions = array();
         $passedOptions = array_keys($options);
 
+        if (!array_key_exists('data', $options)) {
+            $options['data'] = $data;
+        }
+
         while (null !== $type) {
             $type = $this->getType($type);
 
@@ -160,10 +164,6 @@ class FormFactory implements FormFactoryInterface
             }
         }
 
-        if (null !== $data) {
-            $builder->setData($data);
-        }
-
         return $builder;
     }