diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index fba4d747ad..4d2ecf0ca7 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -72,7 +72,6 @@ use Alchemy\Phrasea\Controller\Utils\ConnectionTest;
 use Alchemy\Phrasea\Controller\Utils\PathFileTest;
 use Alchemy\Phrasea\Controller\User\Notifications;
 use Alchemy\Phrasea\Controller\User\Preferences;
-use Alchemy\Phrasea\Core\CLIProvider\DoctrineMigrationServiceProvider;
 use Alchemy\Phrasea\Core\PhraseaExceptionHandler;
 use Alchemy\Phrasea\Core\Event\Subscriber\LogoutSubscriber;
 use Alchemy\Phrasea\Core\Event\Subscriber\PhraseaLocaleSubscriber;
@@ -210,7 +209,6 @@ class Application extends SilexApplication
         $this->register(new BasketMiddlewareProvider());
 
         $this->register(new ACLServiceProvider());
-        $this->register(new DoctrineMigrationServiceProvider());
         $this->register(new AuthenticationManagerServiceProvider());
         $this->register(new BorderManagerServiceProvider());
         $this->register(new BrowserServiceProvider());
diff --git a/lib/Alchemy/Phrasea/CLI.php b/lib/Alchemy/Phrasea/CLI.php
index 317c36b892..9698e890c7 100644
--- a/lib/Alchemy/Phrasea/CLI.php
+++ b/lib/Alchemy/Phrasea/CLI.php
@@ -18,6 +18,7 @@ use Alchemy\Phrasea\Exception\RuntimeException;
 use Symfony\Component\Console;
 use Alchemy\Phrasea\Core\CLIProvider\CLIDriversServiceProvider;
 use Alchemy\Phrasea\Core\CLIProvider\ComposerSetupServiceProvider;
+use Alchemy\Phrasea\Core\CLIProvider\DoctrineMigrationServiceProvider;
 use Alchemy\Phrasea\Core\CLIProvider\LessBuilderServiceProvider;
 use Alchemy\Phrasea\Core\CLIProvider\PluginServiceProvider;
 use Alchemy\Phrasea\Core\CLIProvider\SignalHandlerServiceProvider;
@@ -31,7 +32,6 @@ use Alchemy\Phrasea\Core\CLIProvider\TaskManagerServiceProvider;
  */
 class CLI extends Application
 {
-
     /**
      * Registers the autoloader and necessary components.
      *
@@ -63,6 +63,7 @@ class CLI extends Application
         $this->register(new SignalHandlerServiceProvider());
         $this->register(new TaskManagerServiceProvider());
         $this->register(new TranslationExtractorServiceProvider());
+        $this->register(new DoctrineMigrationServiceProvider());
 
         $this->bindRoutes();
     }
diff --git a/lib/Alchemy/Phrasea/Model/Entities/User.php b/lib/Alchemy/Phrasea/Model/Entities/User.php
index 9f2358a047..d89448bd41 100644
--- a/lib/Alchemy/Phrasea/Model/Entities/User.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/User.php
@@ -1033,10 +1033,6 @@ class User
      */
     public function getDisplayName(TranslatorInterface $translator = null)
     {
-        if ($this->isTemplate() && $translator) {
-            return $translator->trans('modele %name%', ['%name%' => $this->getLogin()]);
-        }
-
         if ($this->isTemplate()) {
             return $this->getLogin();
         }
@@ -1049,10 +1045,6 @@ class User
             return $this->email;
         }
 
-        if ($translator) {
-            return $translator->trans('Unnamed user');
-        }
-
         return 'Unnamed user';
     }
 }
diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig
index 2b3d19c07e..22a57e66a0 100644
--- a/templates/web/admin/editusers.html.twig
+++ b/templates/web/admin/editusers.html.twig
@@ -131,7 +131,7 @@
               <select name="template">
                 <option value="">{{ 'boutton::choisir' | trans }}</option>
                 {% for template in templates %}
-                <option value="{{ template.getId() }}">{{ template.getDisplayName(app['translator']) }}</option>
+                    <option value="{{ template.getId() }}">{{ template.getLogin() }}</option>
                 {% endfor %}
               </select>
                <button class="btn" type='button' id='reset_rights'>{{ 'Delete all users rights' | trans }}</button>
diff --git a/templates/web/admin/users.html.twig b/templates/web/admin/users.html.twig
index 2043abe3ed..4874e6c728 100644
--- a/templates/web/admin/users.html.twig
+++ b/templates/web/admin/users.html.twig
@@ -60,7 +60,7 @@
                 <select name="template_chooser" class="input-medium">
                     <option value="">{{ 'boutton::choisir' | trans }}</option>
                     {% for template in templates %}
-                        <option value="{{ template.getId() }}">{{ template.getDisplayName(app['translator']) }}</option>
+                        <option value="{{ template.getId() }}">{{ template.getLogin() }}</option>
                     {% endfor %}
                 </select>
                 <button type="submit" class="btn">{{ 'boutton::appliquer' | trans }}</button>
@@ -149,7 +149,7 @@
                         </td>
                         {% if usr.getLastModel() is not none %}
                             <td>
-                                {{ usr.getLastModel().getDisplayName(app['translator'])}}
+                                {{ usr.getLastModel().getLogin() }}
                             </td>
                         {% endif %}
                         <td>
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
index 1c871e6944..70cbcd8714 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
@@ -386,8 +386,6 @@ class UsersTest extends \PhraseanetAuthenticatedWebTestCase
 
     public function testPostDemands()
     {
-        $this->markTestSkipped();
-        return;
         $id = self::$DI['user_alt1']->getId();
         $baseId = self::$DI['collection']->get_base_id();
         $param = sprintf('%s_%s', $id, $baseId);