diff --git a/src/WellCommerce/Bundle/AppBundle/Resources/config/wellcommerce.yml b/src/WellCommerce/Bundle/AppBundle/Resources/config/wellcommerce.yml
index 61930c616..cac9c5cf9 100755
--- a/src/WellCommerce/Bundle/AppBundle/Resources/config/wellcommerce.yml
+++ b/src/WellCommerce/Bundle/AppBundle/Resources/config/wellcommerce.yml
@@ -124,17 +124,3 @@ well_commerce_app:
             orm_configuration:
                 mapping: "@WellCommerceAppBundle/Resources/config/doctrine/Price.orm.yml"
                 entity: WellCommerce\Bundle\AppBundle\Entity\Price
-
-fos_js_routing:
-    router: router.default
-
-services:
-    doctrine.cache:
-        class: %doctrine_cache.file_system.class%
-        arguments: ["%kernel.root_dir%/cache/%kernel.environment%/doctrine"]
-
-    client.failure.handler:
-        class: WellCommerce\Bundle\ClientBundle\Handler\LoginFailureHandler
-        arguments:
-          - "@router"
-          - front.client.login
diff --git a/src/WellCommerce/Bundle/ClientBundle/Resources/config/services/client.xml b/src/WellCommerce/Bundle/ClientBundle/Resources/config/services/client.xml
index 710c20454..9fd1c1d45 100755
--- a/src/WellCommerce/Bundle/ClientBundle/Resources/config/services/client.xml
+++ b/src/WellCommerce/Bundle/ClientBundle/Resources/config/services/client.xml
@@ -35,6 +35,11 @@
             <tag name="twig.extension"/>
         </service>
 
+        <service id="client.failure.handler" class="WellCommerce\Bundle\ClientBundle\Handler\LoginFailureHandler">
+            <argument type="service" id="router"/>
+            <argument>front.client.login</argument>
+        </service>
+
         <service id="client.orm.validator.unique" class="WellCommerce\Bundle\ClientBundle\Doctrine\Validator\Constraints\UniqueUsernameValidator">
             <argument type="service" id="client.repository"/>
             <argument type="service" id="router.helper"/>
diff --git a/src/WellCommerce/Bundle/DoctrineBundle/Resources/config/services.xml b/src/WellCommerce/Bundle/DoctrineBundle/Resources/config/services.xml
index ec6a797e3..b11443c65 100755
--- a/src/WellCommerce/Bundle/DoctrineBundle/Resources/config/services.xml
+++ b/src/WellCommerce/Bundle/DoctrineBundle/Resources/config/services.xml
@@ -5,6 +5,10 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
+        <service id="doctrine.cache" class="%doctrine_cache.file_system.class%">
+            <argument>%kernel.root_dir%/cache/%kernel.environment%/doctrine</argument>
+        </service>
+
         <service id="doctrine.class_metadata.enhancer_collection" class="WellCommerce\Bundle\DoctrineBundle\Enhancer\ClassMetadata\ClassMetadataEnhancerCollection" />
 
         <service id="doctrine.class_metadata.enhancer_traverser" class="WellCommerce\Bundle\DoctrineBundle\Enhancer\ClassMetadata\ClassMetadataEnhancerTraverser">
diff --git a/src/WellCommerce/Bundle/RoutingBundle/Resources/config/wellcommerce.yml b/src/WellCommerce/Bundle/RoutingBundle/Resources/config/wellcommerce.yml
index 1d3f04c82..9ad0193f5 100755
--- a/src/WellCommerce/Bundle/RoutingBundle/Resources/config/wellcommerce.yml
+++ b/src/WellCommerce/Bundle/RoutingBundle/Resources/config/wellcommerce.yml
@@ -10,3 +10,7 @@ well_commerce_routing:
             orm_configuration:
                 mapping: "@WellCommerceRoutingBundle/Resources/config/doctrine/Route.orm.yml"
                 entity: WellCommerce\Bundle\RoutingBundle\Entity\Route
+
+
+fos_js_routing:
+    router: router.default