diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart
index 7df70853..ce5bc371 100644
--- a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart
+++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_in/widgets/sign_in_form.dart
@@ -3,12 +3,11 @@
 // -----
 // File: sign_in_form.dart
 // Created Date: 19/08/2022 15:24:37
-// Last Modified: Thu Nov 10 2022
+// Last Modified: Fri Nov 11 2022
 // -----
 // Copyright (c) 2022
 
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart';
 import 'package:wyatt_form_bloc/wyatt_form_bloc.dart';
 
@@ -73,16 +72,12 @@ class SignInForm extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocListener<SignInCubit<int>, SignInState>(
-      listener: (context, state) {
-        if (state.status.isSubmissionFailure) {
-          ScaffoldMessenger.of(context)
-            ..hideCurrentSnackBar()
-            ..showSnackBar(
-              SnackBar(content: Text(state.errorMessage ?? 'Sign In Failure')),
-            );
-        }
-      },
+    return SignInListener(
+      onError: (context, status, errorMessage) => ScaffoldMessenger.of(context)
+        ..hideCurrentSnackBar()
+        ..showSnackBar(
+          SnackBar(content: Text(errorMessage ?? 'Sign In Failure')),
+        ),
       child: SingleChildScrollView(
         child: Column(
           children: [
diff --git a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart
index e01038ea..f9a6da2e 100644
--- a/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart
+++ b/packages/wyatt_authentication_bloc/example_router/lib/presentation/features/sign_up/widgets/sign_up_form.dart
@@ -3,13 +3,12 @@
 // -----
 // File: sign_up_form.dart
 // Created Date: 19/08/2022 14:41:08
-// Last Modified: Thu Nov 10 2022
+// Last Modified: Fri Nov 11 2022
 // -----
 // Copyright (c) 2022
 
 import 'package:example_router/core/constants/form_field.dart';
 import 'package:flutter/material.dart' hide FormField;
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart';
 import 'package:wyatt_form_bloc/wyatt_form_bloc.dart';
 
@@ -110,29 +109,25 @@ class SignUpForm extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocListener<SignUpCubit<int>, SignUpState>(
-      listener: (context, state) {
-        if (state.status.isSubmissionFailure) {
-          ScaffoldMessenger.of(context)
-            ..hideCurrentSnackBar()
-            ..showSnackBar(
-              SnackBar(content: Text(state.errorMessage ?? 'Sign Up Failure')),
-            );
-        }
-      },
-      child: SingleChildScrollView(
-        child: Column(
-          children: [
-            _EmailInput(),
-            const SizedBox(height: 8),
-            _PasswordInput(),
-            const SizedBox(height: 8),
-            _ConfirmPasswordInput(),
-            const SizedBox(height: 16),
-            _SignUpButton(),
-          ],
-        ),
-      ),
-    );
+    return SignUpListener(
+        onError: (context, status, errorMessage) =>
+            ScaffoldMessenger.of(context)
+              ..hideCurrentSnackBar()
+              ..showSnackBar(
+                SnackBar(content: Text(errorMessage ?? 'Sign Up Failure')),
+              ),
+        child: SingleChildScrollView(
+          child: Column(
+            children: [
+              _EmailInput(),
+              const SizedBox(height: 8),
+              _PasswordInput(),
+              const SizedBox(height: 8),
+              _ConfirmPasswordInput(),
+              const SizedBox(height: 16),
+              _SignUpButton(),
+            ],
+          ),
+        ));
   }
 }