diff --git a/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart b/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart
index 85f2dcef..e642ab8f 100644
--- a/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart
+++ b/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart
@@ -174,7 +174,7 @@ class _ForgotPasswordTemplateComponentWidgetState
                       labelStyle:
                       FlutterFlowTheme.of(context).labelMedium.override(
                         fontFamily: 'Plus Jakarta Sans',
-                        color: FlutterFlowTheme.of(context).accent1,
+                        color: FlutterFlowTheme.of(context).primary,
                         fontSize: 14.0,
                         letterSpacing: 0.0,
                         fontWeight: FontWeight.w500,
diff --git a/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart b/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart
index b172f83a..2d946b1a 100644
--- a/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart
+++ b/lib/components/templates_components/sign_in_template_component/sign_in_template_component_widget.dart
@@ -1,4 +1,6 @@
+import 'package:hub/components/atomic_components/shared_components_atoms/atom_image_svg_theme.dart';
 import 'package:hub/shared/components/atoms/atom_terms_of_use.dart';
+import 'package:hub/shared/utils/ValidatorUtil.dart';
 
 import '/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart';
 import '/flutter_flow/flutter_flow_animations.dart';
@@ -100,7 +102,7 @@ class _SignInTemplateComponentWidgetState
       return true;
     }
 
-    if (!RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$').hasMatch(_model.emailAddressTextController.text)) {
+    if (!ValidatorUtil.isValidEmail(_model.emailAddressTextController.text)) {
       return true;
     }
 
@@ -180,12 +182,7 @@ class _SignInTemplateComponentWidgetState
                       decoration: const BoxDecoration(),
                       child: ClipRRect(
                         borderRadius: BorderRadius.circular(8.0),
-                        child: Image.network(
-                          'https://storage.googleapis.com/flutterflow-io-6f20.appspot.com/projects/flutter-freaccess-hub-0xgz9q/assets/sr43ucngg4a4/Vector.png',
-                          width: 603.0,
-                          height: 155.0,
-                          fit: BoxFit.contain,
-                        ),
+                        child: const AtomImageSvgTheme(filename: 'login', width: 600, height: 155),
                       ),
                     ),
                     Column(
diff --git a/lib/shared/utils/ValidatorUtil.dart b/lib/shared/utils/ValidatorUtil.dart
index e69de29b..71e83154 100644
--- a/lib/shared/utils/ValidatorUtil.dart
+++ b/lib/shared/utils/ValidatorUtil.dart
@@ -0,0 +1,10 @@
+class ValidatorUtil {
+
+  static bool isValidEmail(String email) {
+    if (RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$').hasMatch(email)) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+}
\ No newline at end of file