diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 97ede2281f..dbecca12e9 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -107,6 +107,12 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
         $loader->load('security_listeners.xml');
         $loader->load('security_rememberme.xml');
 
+        if ($this->authenticatorManagerEnabled = $config['enable_authenticator_manager']) {
+            $loader->load('security_authenticator.xml');
+        } else {
+            $loader->load('security_legacy.xml');
+        }
+
         if (class_exists(AbstractExtension::class)) {
             $loader->load('templating_twig.xml');
         }
@@ -141,10 +147,6 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
         $container->setParameter('security.access.always_authenticate_before_granting', $config['always_authenticate_before_granting']);
         $container->setParameter('security.authentication.hide_user_not_found', $config['hide_user_not_found']);
 
-        if ($this->authenticatorManagerEnabled = $config['enable_authenticator_manager']) {
-            $loader->load('authenticators.xml');
-        }
-
         $this->createFirewalls($config, $container);
         $this->createAuthorization($config, $container);
         $this->createRoleHierarchy($config, $container);
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
index b04662aaf7..26da337312 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -45,24 +45,6 @@
         </service>
 
         <!-- Authentication related services -->
-        <service id="security.authentication.manager.provider" class="Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager">
-            <argument /> <!-- providers -->
-            <argument>%security.authentication.manager.erase_credentials%</argument>
-            <call method="setEventDispatcher">
-                <argument type="service" id="event_dispatcher" />
-            </call>
-        </service>
-        <service id="security.authentication.manager.authenticator" class="Symfony\Component\Security\Http\Authentication\AuthenticatorManager">
-            <argument /> <!-- authenticators -->
-            <argument type="service" id="event_dispatcher" />
-            <argument>%security.authentication.manager.erase_credentials%</argument>
-            <call method="setEventDispatcher">
-                <argument type="service" id="event_dispatcher" />
-            </call>
-        </service>
-        <service id="security.authentication.manager" alias="security.authentication.manager.provider"/>
-        <service id="Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface" alias="security.authentication.manager" />
-
         <service id="security.authentication.trust_resolver" class="Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver" />
 
         <service id="security.authentication.session_strategy" class="Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy">
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/authenticators.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.xml
similarity index 82%
rename from src/Symfony/Bundle/SecurityBundle/Resources/config/authenticators.xml
rename to src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.xml
index 9ec5f17e0a..4cbc440625 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/authenticators.xml
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_authenticator.xml
@@ -4,6 +4,18 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
+        <!-- Manager -->
+
+        <service id="security.authentication.manager.authenticator" class="Symfony\Component\Security\Http\Authentication\AuthenticatorManager">
+            <argument type="abstract">authenticators</argument>
+            <argument type="service" id="event_dispatcher" />
+            <argument>%security.authentication.manager.erase_credentials%</argument>
+            <call method="setEventDispatcher">
+                <argument type="service" id="event_dispatcher" />
+            </call>
+        </service>
+        <service id="Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface" alias="security.authentication.manager" />
+
         <service id="security.authenticator_handler"
                  class="Symfony\Component\Security\Http\Authentication\AuthenticatorHandler"
         >
@@ -38,12 +50,12 @@
             <argument type="service" id="security.encoder_factory" />
         </service>
 
-        <service id="Symfony\Component\Security\Http\EventListener\PasswordMigratingListener">
+        <service id="security.listener.password_migrating" class="Symfony\Component\Security\Http\EventListener\PasswordMigratingListener">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="security.encoder_factory" />
         </service>
 
-        <service id="Symfony\Component\Security\Http\EventListener\UserCheckerListener">
+        <service id="security.listener.user_checker" class="Symfony\Component\Security\Http\EventListener\UserCheckerListener">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="Symfony\Component\Security\Core\User\UserCheckerInterface" />
         </service>
@@ -53,7 +65,6 @@
                  abstract="true">
             <tag name="monolog.logger" channel="security" />
             <argument type="abstract">remember me services</argument>
-            <argument type="abstract">provider key</argument>
             <argument type="service" id="logger" on-invalid="null" />
         </service>
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_legacy.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_legacy.xml
new file mode 100644
index 0000000000..85d672a078
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_legacy.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <defaults public="false" />
+
+        <!-- Authentication related services -->
+        <service id="security.authentication.manager" class="Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager">
+            <argument /> <!-- providers -->
+            <argument>%security.authentication.manager.erase_credentials%</argument>
+            <call method="setEventDispatcher">
+                <argument type="service" id="event_dispatcher" />
+            </call>
+        </service>
+        <service id="Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface" alias="security.authentication.manager" />
+    </services>
+</container>