diff --git a/lib/main.dart b/lib/main.dart
index 2497ddd..24a3171 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -13,5 +13,4 @@ void main() async {
   );
   Bloc.observer = SimpleBlocObserver();
   runApp(MyApp(FirebaseUserRepo()));
-}
-// bentar xfgxfgxfgx
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/screens/auth/views/sign_in_screen.dart b/lib/screens/auth/views/sign_in_screen.dart
index 7659aa9..e800018 100644
--- a/lib/screens/auth/views/sign_in_screen.dart
+++ b/lib/screens/auth/views/sign_in_screen.dart
@@ -57,8 +57,6 @@ class _SignInScreenState extends State<SignInScreen> {
                 validator: (val) {
                   if (val!.isEmpty) {
                     return 'Please fill in this field';
-                  } else if (!RegExp(r'^[\w-\.]+@([\w-]+.)+[\w-]{2,4}$').hasMatch(val)) {
-                    return 'Please enter a valid email';
                   }
                   return null;
                 }
@@ -77,8 +75,6 @@ class _SignInScreenState extends State<SignInScreen> {
                 validator: (val) {
                   if (val!.isEmpty) {
                     return 'Please fill in this field';
-                  } else if (!RegExp(r'^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[!@#\$&*~`)\%\-(_+=;:,.<>/?"[{\]}\|^]).{8,}$').hasMatch(val)) {
-                    return 'Please enter a valid password';
                   }
                   return null;
                 },
diff --git a/lib/screens/auth/views/sign_up_screen.dart b/lib/screens/auth/views/sign_up_screen.dart
index 8eb7f61..70c9b31 100644
--- a/lib/screens/auth/views/sign_up_screen.dart
+++ b/lib/screens/auth/views/sign_up_screen.dart
@@ -22,6 +22,12 @@ class _SignUpScreenState extends State<SignUpScreen> {
   bool obscurePassword = true;
   bool signUpRequired = false;
 
+  bool containsUpperCase = false;
+	bool containsLowerCase = false;
+	bool containsNumber = false;
+	bool containsSpecialChar = false;
+	bool contains8Length = false;
+
   @override
   Widget build(BuildContext context) {
     return BlocListener<SignUpBloc, SignUpState>(
@@ -113,8 +119,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
                               validator: (val) {
                                 if (val == null || val.isEmpty) {
                                   return 'Please fill in this field';
-                                } else if (!RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$').hasMatch(val)) {
-                                  return 'Please enter a valid email';
                                 }
                                 return null;
                               },
@@ -145,8 +149,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
                               validator: (val) {
                                 if (val == null || val.isEmpty) {
                                   return 'Please fill in this field';
-                                } else if (val.length < 6) {
-                                  return 'Password minimal 6 karakter';
                                 }
                                 return null;
                               },