diff --git a/core/lib/Thelia/Action/Customer.php b/core/lib/Thelia/Action/Customer.php
index 53d9a4c69..fe1379aed 100755
--- a/core/lib/Thelia/Action/Customer.php
+++ b/core/lib/Thelia/Action/Customer.php
@@ -39,7 +39,6 @@ use Thelia\Model\ConfigQuery;
 use Thelia\Tools\Redirect;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Thelia\Core\Security\Exception\AuthenticationException;
-use Thelia\Core\Template\ParserContext;
 use Thelia\Core\Security\Exception\UsernameNotFoundException;
 use Propel\Runtime\Exception\PropelException;
 
@@ -51,14 +50,8 @@ class Customer implements EventSubscriberInterface
 	 */
 	protected $securityContext;
 
-	/**
-	 * @var Thelia\Core\Template\ParserContext
-	 */
-	protected $parserContext;
-
-	public function __construct(SecurityContext $securityContext, ParserContext $parserContext) {
+	public function __construct(SecurityContext $securityContext) {
 		$this->securityContext = $securityContext;
-		$this->parserContext = $parserContext;
 	}
 
     public function create(ActionEvent $event)
@@ -119,7 +112,7 @@ class Customer implements EventSubscriberInterface
         $customerCreationForm->setErrorMessage($message);
 
         // Store the form in the parser context
-        $this->parserContext->setErrorForm($customerCreationForm);
+        $event->setErrorForm($customerCreationForm);
 
         // Stop event propagation
         $event->stopPropagation();
@@ -183,11 +176,8 @@ class Customer implements EventSubscriberInterface
         $customerModification->setError(true);
         $customerModification->setErrorMessage($message);
 
-        // Store the form in the parser context
-        $this->parserContext->setErrorForm($customerModification);
-
-        // Stop event propagation
-        $event->stopPropagation();
+        // Dispatch the errored form
+        $event->setErrorForm($customerModification);
     }
 
 
@@ -241,8 +231,8 @@ class Customer implements EventSubscriberInterface
     	$customerLoginForm->setError(true);
     	$customerLoginForm->setErrorMessage($message);
 
-    	// Store the form name in session (see Form Smarty plugin to find usage of this parameter)
-    	$this->parserContext->setErrorForm($customerLoginForm);
+    	// Dispatch the errored form
+    	$event->setErrorForm($customerLoginForm);
 
     	// A this point, the same view is displayed again.
     }
diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index 935faa8c3..0b2304704 100755
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -22,7 +22,6 @@
             <tag name="kernel.event_subscriber"/>
 
             <argument type="service" id="thelia.securityContext"/>
-            <argument type="service" id="thelia.parser.context"/>
         </service>
 
     </services>
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 081a6c1d7..a8cf23d8a 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -34,8 +34,9 @@
             <argument type="service" id="service_container" />
         </service>
 
-        <service id="thelia.controller_listener" class="Thelia\Core\EventListener\ControllerListener">
+        <service id="thelia.controller_listener" class="Thelia\Core\EventListener\ControllerListener" scope="request">
             <tag name="kernel.event_subscriber"/>
+            <argument type="service" id="thelia.parser.context"/>
         </service>
 
 		<!--
diff --git a/core/lib/Thelia/Core/Event/ActionEvent.php b/core/lib/Thelia/Core/Event/ActionEvent.php
index 42ac5db96..3dbbb106e 100755
--- a/core/lib/Thelia/Core/Event/ActionEvent.php
+++ b/core/lib/Thelia/Core/Event/ActionEvent.php
@@ -49,7 +49,7 @@ abstract class ActionEvent extends Event
      */
     protected $action;
 
-    protected $form = null;
+    protected $errorForm = null;
 
     /**
      *
@@ -79,4 +79,18 @@ abstract class ActionEvent extends Event
     {
         return $this->request;
     }
+
+    public function setErrorForm(BaseForm $form) {
+    	$this->errorForm = $form;
+
+    	if ($form != null) $this->stopPropagation();
+    }
+
+    public function getErrorForm() {
+    	return $this->errorForm;
+    }
+
+    public function hasErrorForm() {
+    	return $this->errorForm != null ? true : false;
+    }
 }
diff --git a/core/lib/Thelia/Core/EventListener/ControllerListener.php b/core/lib/Thelia/Core/EventListener/ControllerListener.php
index 63fead7ce..4bda0d064 100755
--- a/core/lib/Thelia/Core/EventListener/ControllerListener.php
+++ b/core/lib/Thelia/Core/EventListener/ControllerListener.php
@@ -26,6 +26,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Thelia\Core\Factory\ActionEventFactory;
+use Thelia\Core\Template\ParserContext;
 
 /**
  *
@@ -38,6 +39,14 @@ use Thelia\Core\Factory\ActionEventFactory;
  */
 class ControllerListener implements EventSubscriberInterface
 {
+	/**
+	 * @var ParserContext the parser context
+	 */
+	protected $parserContext;
+
+	public function __construct(ParserContext $parserContext) {
+		$this->parserContext = $parserContext;
+	}
 
     public function onKernelController(FilterControllerEvent $event)
     {
@@ -49,6 +58,11 @@ class ControllerListener implements EventSubscriberInterface
             $event = new ActionEventFactory($request, $action, $event->getKernel()->getContainer()->getParameter("thelia.actionEvent"));
             $actionEvent = $event->createActionEvent();
             $dispatcher->dispatch("action.".$action, $actionEvent);
+
+            // Process form errors
+            if ($actionEvent->hasErrorForm()) {
+            	$this->parserContext->setErrorForm($actionEvent->getErrorForm());
+            }
         }
     }
 
diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php
index df2fb1c2c..3b5c6bf17 100755
--- a/core/lib/Thelia/Form/CustomerCreation.php
+++ b/core/lib/Thelia/Form/CustomerCreation.php
@@ -27,7 +27,6 @@ use Symfony\Component\Validator\ExecutionContextInterface;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\CustomerQuery;
 
-
 class CustomerCreation extends BaseForm
 {
 
@@ -161,6 +160,6 @@ class CustomerCreation extends BaseForm
 
     public function getName()
     {
-        return "customerCreation";
+        return "thelia.customer.creation";
     }
 }
\ No newline at end of file
diff --git a/core/lib/Thelia/Form/CustomerLogin.php b/core/lib/Thelia/Form/CustomerLogin.php
index 52357dbd6..04498b5ea 100644
--- a/core/lib/Thelia/Form/CustomerLogin.php
+++ b/core/lib/Thelia/Form/CustomerLogin.php
@@ -51,6 +51,6 @@ class CustomerLogin extends BaseForm {
 
     public function getName()
     {
-        return "customer_login";
+        return "thelia.customer.login";
     }
 }
diff --git a/core/lib/Thelia/Form/CustomerModification.php b/core/lib/Thelia/Form/CustomerModification.php
index c87e5fece..aa2a52a04 100755
--- a/core/lib/Thelia/Form/CustomerModification.php
+++ b/core/lib/Thelia/Form/CustomerModification.php
@@ -115,6 +115,6 @@ class CustomerModification extends BaseForm {
      */
     public function getName()
     {
-        return "customerModification";
+        return "thelia.customer.modification";
     }
 }
\ No newline at end of file