General Fixes
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index e27fce5..641007b 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -37,7 +37,7 @@
             - '@security.user_checker'
             - '@security.token_storage'
             - '@session'
-            - '@bigfoot_context'
+            - '@bigfoot_context.service.context'
             - '@bigfoot_user.mailer.user'
             - '@bigfoot_core.generator.token'
         calls:
@@ -63,7 +63,7 @@
         class: 'Bigfoot\Bundle\UserBundle\Form\Type\UserType'
         arguments:
             - '@security.authorization_checker'
-            - '@bigfoot_context'
+            - '@bigfoot_context.service.context'
             - '@event_dispatcher'
         tags:
             - { name: form.type }