diff --git a/packages/deriv_auth_ui/example/analysis_options.yaml b/packages/deriv_auth_ui/example/analysis_options.yaml
index 61b6c4de1..1313ff64b 100644
--- a/packages/deriv_auth_ui/example/analysis_options.yaml
+++ b/packages/deriv_auth_ui/example/analysis_options.yaml
@@ -22,8 +22,6 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
+    depend_on_referenced_packages: false
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/packages/deriv_auth_ui/example/lib/features/login/services/example_login_service.dart b/packages/deriv_auth_ui/example/lib/features/login/services/example_login_service.dart
index 66c517885..63c832a4f 100644
--- a/packages/deriv_auth_ui/example/lib/features/login/services/example_login_service.dart
+++ b/packages/deriv_auth_ui/example/lib/features/login/services/example_login_service.dart
@@ -17,9 +17,7 @@ class ExampleLoginService extends BaseAuthService {
 
   @override
   Future<AuthorizeEntity> onLoginRequest(
-    GetTokensRequestModel request, [
-    Function? onInvalidJwtToken,
-  ]) async =>
+          {required GetTokensRequestModel request, String? userAgent}) async =>
       const AuthorizeEntity();
 
   @override
diff --git a/packages/deriv_auth_ui/lib/src/features/login/layouts/deriv_login_layout.dart b/packages/deriv_auth_ui/lib/src/features/login/layouts/deriv_login_layout.dart
index 9671a72a8..37aff417f 100644
--- a/packages/deriv_auth_ui/lib/src/features/login/layouts/deriv_login_layout.dart
+++ b/packages/deriv_auth_ui/lib/src/features/login/layouts/deriv_login_layout.dart
@@ -293,7 +293,8 @@ class _DerivLoginLayoutState extends State<DerivLoginLayout> {
   }
 
   bool _isFormValid() =>
-      _getEmailValue().isNotEmpty && _passwordController.text.isNotEmpty;
+      _getEmailValue().isValidEmail &&
+      _passwordController.text.isValidLoginPasswordLength;
 
   String? _emailValidator(String? input) {
     if (_getEmailValue().isValidEmail) {