diff --git a/app/config/routing.yml b/app/config/routing.yml
index 1a781dbce..205fe8230 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -3,11 +3,6 @@ wallabag_import:
     type: annotation
     prefix: /import
 
-wallabag_user:
-    resource: "@WallabagUserBundle/Controller/"
-    type: annotation
-    prefix: /users
-
 wallabag_api:
     resource: "@WallabagApiBundle/Controller/"
     type: annotation
diff --git a/app/config/services.yml b/app/config/services.yml
index d65fa1d00..ec204cf26 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -54,10 +54,6 @@ services:
         resource: '../../src/Wallabag/ImportBundle/Controller/'
         tags: ['controller.service_arguments']
 
-    Wallabag\UserBundle\Controller\:
-        resource: '../../src/Wallabag/UserBundle/Controller/'
-        tags: ['controller.service_arguments']
-
     # inject alias service into controllers
     Wallabag\ImportBundle\Controller\ChromeController:
         arguments:
diff --git a/src/Wallabag/UserBundle/Controller/UserController.php b/src/Wallabag/CoreBundle/Controller/UserController.php
similarity index 94%
rename from src/Wallabag/UserBundle/Controller/UserController.php
rename to src/Wallabag/CoreBundle/Controller/UserController.php
index bfd9900c9..8462b7f87 100644
--- a/src/Wallabag/UserBundle/Controller/UserController.php
+++ b/src/Wallabag/CoreBundle/Controller/UserController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Controller;
+namespace Wallabag\CoreBundle\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Event\UserEvent;
@@ -17,7 +17,6 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
 use Wallabag\UserBundle\Entity\User;
 use Wallabag\UserBundle\Form\NewUserType;
 use Wallabag\UserBundle\Form\SearchUserType;
@@ -41,7 +40,7 @@ class UserController extends AbstractController
     /**
      * Creates a new User entity.
      *
-     * @Route("/new", name="user_new", methods={"GET", "POST"})
+     * @Route("/users/new", name="user_new", methods={"GET", "POST"})
      */
     public function newAction(Request $request, UserManagerInterface $userManager, EventDispatcherInterface $eventDispatcher)
     {
@@ -77,7 +76,7 @@ class UserController extends AbstractController
     /**
      * Displays a form to edit an existing User entity.
      *
-     * @Route("/{id}/edit", name="user_edit", methods={"GET", "POST"})
+     * @Route("/users/{id}/edit", name="user_edit", methods={"GET", "POST"})
      */
     public function editAction(Request $request, User $user, UserManagerInterface $userManager, GoogleAuthenticatorInterface $googleAuthenticator)
     {
@@ -119,7 +118,7 @@ class UserController extends AbstractController
     /**
      * Deletes a User entity.
      *
-     * @Route("/{id}", name="user_delete", methods={"DELETE"})
+     * @Route("/users/{id}", name="user_delete", methods={"DELETE"})
      */
     public function deleteAction(Request $request, User $user)
     {
@@ -142,7 +141,7 @@ class UserController extends AbstractController
     /**
      * @param int $page
      *
-     * @Route("/list/{page}", name="user_index", defaults={"page" = 1})
+     * @Route("/users/list/{page}", name="user_index", defaults={"page" = 1})
      *
      * Default parameter for page is hardcoded (in duplication of the defaults from the Route)
      * because this controller is also called inside the layout template without any page as argument
diff --git a/tests/Wallabag/UserBundle/Controller/UserControllerTest.php b/tests/Wallabag/CoreBundle/Controller/UserControllerTest.php
similarity index 98%
rename from tests/Wallabag/UserBundle/Controller/UserControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/UserControllerTest.php
index e746f4277..e76c61e6a 100644
--- a/tests/Wallabag/UserBundle/Controller/UserControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/UserControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\UserBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller;
 
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;