diff --git a/packages/authenticator/amplify_authenticator/lib/src/screens/authenticator_screen.dart b/packages/authenticator/amplify_authenticator/lib/src/screens/authenticator_screen.dart
index 58f6e4a3db..2524d2cb35 100644
--- a/packages/authenticator/amplify_authenticator/lib/src/screens/authenticator_screen.dart
+++ b/packages/authenticator/amplify_authenticator/lib/src/screens/authenticator_screen.dart
@@ -192,6 +192,7 @@ class _FormWrapperView extends StatelessAuthenticatorComponent {
             form,
           ],
         );
+        break;
     }
 
     return Padding(padding: padding, child: layout);
diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart
index f7f941dbcf..d65618fa04 100644
--- a/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart
+++ b/packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_in_form_field.dart
@@ -159,6 +159,8 @@ class _SignInTextFieldState extends _SignInFormFieldState<String>
         return (v) => state.username = v;
       case SignInField.password:
         return (v) => state.password = v;
+      default:
+        return super.onChanged;
     }
   }