diff --git a/app/config/config.yml b/app/config/config.yml
index af4fb6d..e79241a 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -4,7 +4,7 @@ imports:
 
 framework:
     #esi:             ~
-    #translator:      { fallback: "%locale%" }
+    translator:      { fallback: "%locale%" }
     secret:          "%secret%"
     router:
         resource: "%kernel.root_dir%/config/routing.yml"
@@ -126,9 +126,9 @@ hwi_oauth:
 
 fos_oauth_server:
     db_driver: mongodb
-    client_class:        Wallabag\Bundle\ApiBundle\Document\Client
-    access_token_class:  Wallabag\Bundle\ApiBundle\Document\AccessToken
-    refresh_token_class: Wallabag\Bundle\ApiBundle\Document\RefreshToken
-    auth_code_class:     Wallabag\Bundle\ApiBundle\Document\AuthCode
+    client_class:        Wallabag\Bundle\CoreBundle\Document\Client
+    access_token_class:  Wallabag\Bundle\CoreBundle\Document\AccessToken
+    refresh_token_class: Wallabag\Bundle\CoreBundle\Document\RefreshToken
+    auth_code_class:     Wallabag\Bundle\CoreBundle\Document\AuthCode
     service:
-        user_provider: fos_user.user_manager
\ No newline at end of file
+        user_provider: fos_user.user_manager
diff --git a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AccessToken.mongodb.xml b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AccessToken.mongodb.xml
index 7055d81..744def9 100644
--- a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AccessToken.mongodb.xml
+++ b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AccessToken.mongodb.xml
@@ -3,9 +3,9 @@
       xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                     http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
 
-    <document name="Wallabag\ApiBundle\Document\AccessToken" db="wallabag" collection="oauthAccessToken" customId="true">
+    <document name="Wallabag\Bundle\CoreBundle\Document\AccessToken" db="wallabag" collection="oauthAccessToken" customId="true">
         <field fieldName="id" id="true" strategy="AUTO" />
-        <reference-one target-document="Wallabag\ApiBundle\Document\Client" field="client" />
+        <reference-one target-document="Wallabag\Bundle\CoreBundle\Document\Client" field="client" />
     </document>
 
 </doctrine-mongo-mapping>
\ No newline at end of file
diff --git a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AuthCode.mongodb.xml b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AuthCode.mongodb.xml
index 2d2b209..9efee0c 100644
--- a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AuthCode.mongodb.xml
+++ b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/AuthCode.mongodb.xml
@@ -3,9 +3,9 @@
       xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                     http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
 
-    <document name="Wallabag\Bundle\ApiBundle\Document\AuthCode" db="wallabag" collection="oauthAuthCode" customId="true">
+    <document name="Wallabag\Bundle\CoreBundle\Document\AuthCode" db="wallabag" collection="oauthAuthCode" customId="true">
         <field fieldName="id" id="true" strategy="AUTO" />
-        <reference-one target-document="Wallabag\Bundle\ApiBundle\Document\Client" field="client" />
+        <reference-one target-document="Wallabag\Bundle\CoreBundle\Document\Client" field="client" />
     </document>
 
 </doctrine-mongo-mapping>
\ No newline at end of file
diff --git a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/Client.mongodb.xml b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/Client.mongodb.xml
index c95b88b..06c99ce 100644
--- a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/Client.mongodb.xml
+++ b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/Client.mongodb.xml
@@ -3,7 +3,7 @@
       xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                     http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
 
-    <document name="Wallabag\Bundle\ApiBundle\Document\Client" db="wallabag" collection="oauthClient" customId="true">
+    <document name="Wallabag\Bundle\CoreBundle\Document\Client" db="wallabag" collection="oauthClient" customId="true">
         <field fieldName="id" id="true" strategy="AUTO" />
     </document>
 
diff --git a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/RefreshToken.mongodb.xml b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/RefreshToken.mongodb.xml
index c77b9d7..80dd5ef 100644
--- a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/RefreshToken.mongodb.xml
+++ b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/RefreshToken.mongodb.xml
@@ -3,9 +3,9 @@
       xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
                     http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
 
-    <document name="Wallabag\Bundle\ApiBundle\Document\RefreshToken" db="=wallabag" collection="oauthRefreshToken" customId="true">
+    <document name="Wallabag\Bundle\CoreBundle\Document\RefreshToken" db="=wallabag" collection="oauthRefreshToken" customId="true">
         <field fieldName="id" id="true" strategy="AUTO" />
-        <reference-one target-document="Wallabag\Bundle\ApiBundle\Document\Client" field="client" />
+        <reference-one target-document="Wallabag\Bundle\CoreBundle\Document\Client" field="client" />
     </document>
 
 </doctrine-mongo-mapping>
\ No newline at end of file
diff --git a/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/User.mongodb.xml b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/User.mongodb.xml
new file mode 100644
index 0000000..f48c655
--- /dev/null
+++ b/src/Wallabag/Bundle/CoreBundle/Resources/config/doctrine/User.mongodb.xml
@@ -0,0 +1,10 @@
+<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping
+                    http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
+
+    <document name="Wallabag\Bundle\CoreBundle\Document\User" db="wallabag" collection="oauthClient" customId="true">
+        <field fieldName="id" id="true" strategy="AUTO" />
+    </document>
+
+</doctrine-mongo-mapping>
\ No newline at end of file