diff --git a/src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/changePassword_content.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig
rename to app/Resources/FOSUserBundle/views/ChangePassword/changePassword_content.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig b/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig
rename to app/Resources/FOSUserBundle/views/Registration/check_email.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig b/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
rename to app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig b/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
rename to app/Resources/FOSUserBundle/views/Registration/register_content.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig b/app/Resources/FOSUserBundle/views/Resetting/check_email.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig
rename to app/Resources/FOSUserBundle/views/Resetting/check_email.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig b/app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
rename to app/Resources/FOSUserBundle/views/Resetting/request_content.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig b/app/Resources/FOSUserBundle/views/Resetting/reset_content.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
rename to app/Resources/FOSUserBundle/views/Resetting/reset_content.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/app/Resources/FOSUserBundle/views/Security/login.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
rename to app/Resources/FOSUserBundle/views/Security/login.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/app/Resources/FOSUserBundle/views/layout.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/layout.html.twig
rename to app/Resources/FOSUserBundle/views/layout.html.twig
diff --git a/app/config/routing.yml b/app/config/routing.yml
index d4defca02..4fff4cb62 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -41,6 +41,18 @@ homepage:
 fos_user:
     resource: "@FOSUserBundle/Resources/config/routing/all.xml"
 
+fos_user_security_login:
+    path: /login
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\SecurityController::loginAction
+    methods: [GET, POST]
+
+fos_user_registration_register:
+    path: /register
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\RegistrationController::registerAction
+    methods: [GET, POST]
+
 fos_oauth_server_token:
     resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
 
diff --git a/src/Wallabag/UserBundle/WallabagUserBundle.php b/src/Wallabag/UserBundle/WallabagUserBundle.php
index d9180b3bd..e6e650423 100644
--- a/src/Wallabag/UserBundle/WallabagUserBundle.php
+++ b/src/Wallabag/UserBundle/WallabagUserBundle.php
@@ -6,8 +6,4 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class WallabagUserBundle extends Bundle
 {
-    public function getParent()
-    {
-        return 'FOSUserBundle';
-    }
 }