diff --git a/app/config/config.yml b/app/config/config.yml
index 386aefb99..e465a013f 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -194,13 +194,13 @@ scheb_two_factor:
     google:
         enabled: true
         issuer: "%server_name%"
-        template: "@WallabagUser/Authentication/form.html.twig"
+        template: "@WallabagCore/Authentication/form.html.twig"
 
     email:
         enabled: true
         sender_email: "%twofactor_sender%"
         digits: 6
-        template: "@WallabagUser/Authentication/form.html.twig"
+        template: "@WallabagCore/Authentication/form.html.twig"
         mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer
 
 rulerz:
diff --git a/src/Wallabag/CoreBundle/Controller/UserController.php b/src/Wallabag/CoreBundle/Controller/UserController.php
index 525a6431c..fbe230ba0 100644
--- a/src/Wallabag/CoreBundle/Controller/UserController.php
+++ b/src/Wallabag/CoreBundle/Controller/UserController.php
@@ -67,7 +67,7 @@ class UserController extends AbstractController
             return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
         }
 
-        return $this->render('@WallabagUser/User/new.html.twig', [
+        return $this->render('@WallabagCore/User/new.html.twig', [
             'user' => $user,
             'form' => $form->createView(),
         ]);
@@ -108,7 +108,7 @@ class UserController extends AbstractController
             return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
         }
 
-        return $this->render('@WallabagUser/User/edit.html.twig', [
+        return $this->render('@WallabagCore/User/edit.html.twig', [
             'user' => $user,
             'edit_form' => $form->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -173,7 +173,7 @@ class UserController extends AbstractController
             }
         }
 
-        return $this->render('@WallabagUser/User/index.html.twig', [
+        return $this->render('@WallabagCore/User/index.html.twig', [
             'searchForm' => $form->createView(),
             'users' => $pagerFanta,
         ]);
diff --git a/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
index c0d70c6dd..823ef4187 100644
--- a/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
+++ b/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
@@ -78,7 +78,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
      */
     public function sendAuthCode(TwoFactorInterface $user): void
     {
-        $template = $this->twig->load('@WallabagUser/TwoFactor/email_auth_code.html.twig');
+        $template = $this->twig->load('@WallabagCore/TwoFactor/email_auth_code.html.twig');
 
         $subject = $template->renderBlock('subject', []);
         $bodyHtml = $template->renderBlock('body_html', [
diff --git a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig b/src/Wallabag/CoreBundle/Resources/views/Authentication/form.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/Authentication/form.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig b/src/Wallabag/CoreBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig b/src/Wallabag/CoreBundle/Resources/views/TwoFactor/email_auth_code.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/TwoFactor/email_auth_code.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/User/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/User/edit.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/User/edit.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/User/edit.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/User/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/User/index.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/User/index.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/User/index.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/User/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/User/new.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/User/new.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/User/new.html.twig
diff --git a/tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php
index 497fdb833..70db27904 100644
--- a/tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php
@@ -22,7 +22,7 @@ class AuthCodeMailerTest extends TestCase
 {% block body_text %}text body {{ support_url }}{% endblock %}
 TWIG;
 
-        $this->twig = new Environment(new ArrayLoader(['@WallabagUser/TwoFactor/email_auth_code.html.twig' => $twigTemplate]));
+        $this->twig = new Environment(new ArrayLoader(['@WallabagCore/TwoFactor/email_auth_code.html.twig' => $twigTemplate]));
     }
 
     public function testSendEmail()