diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Form/Field.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Form/Field.php
index 052ddce0b5224..f1c503e0f5f76 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Form/Field.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Form/Field.php
@@ -49,14 +49,14 @@ public function widget(array $attributes = array(), $template = null)
         }
 
         return $this->engine->render($template, array(
-            'field'      => $this,
+            'field'      => $this->field,
             'origin'     => $this->field,
             'attributes' => array_merge($this->field->getAttributes(), $attributes),
             'generator'  => $this->generator,
         ));
     }
 
-    public function label($label, $template = null)
+    public function label($label = false, $template = null)
     {
         if (null === $template) {
             $template = 'FrameworkBundle:Form:label.php';