diff --git a/core/lib/Thelia/Form/ContactForm.php b/core/lib/Thelia/Form/ContactForm.php
index 1d8366806..ea4b3989c 100644
--- a/core/lib/Thelia/Form/ContactForm.php
+++ b/core/lib/Thelia/Form/ContactForm.php
@@ -21,7 +21,7 @@ use Thelia\Core\Translation\Translator;
  * @package Thelia\Form
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class ContactForm extends BaseForm
+class ContactForm extends FirewallForm
 {
 
     /**
diff --git a/core/lib/Thelia/Form/CustomerLostPasswordForm.php b/core/lib/Thelia/Form/CustomerLostPasswordForm.php
index 3d29605e9..012e2bf4d 100644
--- a/core/lib/Thelia/Form/CustomerLostPasswordForm.php
+++ b/core/lib/Thelia/Form/CustomerLostPasswordForm.php
@@ -24,7 +24,7 @@ use Thelia\Model\CustomerQuery;
  * @package Thelia\Form
  * @author Manuel Raynaud <mraynaud@openstudio.fr>
  */
-class CustomerLostPasswordForm extends BaseForm
+class CustomerLostPasswordForm extends FirewallForm
 {
     /**
      *
diff --git a/core/lib/Thelia/Form/OrderPayment.php b/core/lib/Thelia/Form/OrderPayment.php
index 6d1182a4a..4ecabfe2e 100644
--- a/core/lib/Thelia/Form/OrderPayment.php
+++ b/core/lib/Thelia/Form/OrderPayment.php
@@ -24,7 +24,7 @@ use Thelia\Module\BaseModule;
  * @package Thelia\Form
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
  */
-class OrderPayment extends BaseForm
+class OrderPayment extends FirewallForm
 {
     protected function buildForm()
     {