3 files changed, 7 insertions, 6 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index cad51e6c..30fd6063 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -51,7 +51,7 @@ wallabag_core:
     reading_speed: 1
 
 wallabag_user:
-    registration_enabled: "%registration_enabled%"
+    registration_enabled: "%fosuser_registration%"
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php
index bba27cfb..d6d0fda1 100644
--- a/src/Wallabag/UserBundle/Controller/RegistrationController.php
+++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php
@@ -10,11 +10,9 @@ class RegistrationController extends FOSRegistrationController
     public function registerAction(Request $request)
     {
         if ($this->container->getParameter('wallabag_user.registration_enabled')) {
-            parent::registerAction($request);
-        }
-        else
-        {
-            return $this->redirectToRoute('fos_user_security_login', array(), 301);
+            return parent::registerAction($request);
         }
+
+        return $this->redirectToRoute('fos_user_security_login', array(), 301);
     }
 }
diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php
index a5f93763..1e752b6d 100644
--- a/src/Wallabag/UserBundle/Controller/SecurityController.php
+++ b/src/Wallabag/UserBundle/Controller/SecurityController.php
@@ -4,6 +4,9 @@ namespace Wallabag\UserBundle\Controller;
 
 use FOS\UserBundle\Controller\SecurityController as FOSSecurityController;
 
+/**
+ * Extends login form in order to pass the registration_enabled parameter.
+ */
 class SecurityController extends FOSSecurityController
 {
     protected function renderLogin(array $data)