-    #Register logout success handler
-    security.logout.success_handler:
-        class: 'Rapsys\UserBundle\Handler\LogoutSuccessHandler'
+    #Register Authentication failure handler
+    security.authentication.failure_handler:
+        class: 'Rapsys\UserBundle\Handler\AuthenticationFailureHandler'
+        arguments: [ '@http_kernel', '@security.http_utils', {}, '@logger', '@service_container', '@doctrine', '@router', '@rapsys_pack.slugger_util', '@security.csrf.token_manager' ]
+    #Register default logout listener
+    security.logout.listener.default:
+        class: 'Rapsys\UserBundle\Listener\LogoutListener'