diff --git a/.gitignore b/.gitignore
index aa724b7..ab86181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@
 .externalNativeBuild
 .cxx
 local.properties
+
+# AI prompt artifacts
+_hunter_prompt.txt
diff --git a/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java b/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java
index 8700ad9..e475280 100644
--- a/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java
+++ b/app/src/main/java/com/example/updateapp/views/activites/LoginActivity.java
@@ -30,6 +30,7 @@
 import com.google.firebase.firestore.FirebaseFirestore;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public class LoginActivity extends AppCompatActivity {
@@ -69,72 +70,10 @@ protected void onCreate(Bundle savedInstanceState) {
         progressDialog.setTitle(getString(R.string.logging_in));
         progressDialog.setMessage(getString(R.string.please_wait));
 
-        binding.emailBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                String email = binding.edtEmail.getText().toString();
-                String password = binding.edtPassword.getText().toString();
-
-                if (email.isEmpty()) {
-                    binding.edtEmail.setError(getString(R.string.enter_valid_email));
-                } else if (password.isEmpty()) {
-                    binding.edtPassword.setError(getString(R.string.enter_strong_password));
-                } else {
-
-                    progressDialog.show();
-                    auth.signInWithEmailAndPassword(email, password).addOnCompleteListener(new OnCompleteListener<AuthResult>() {
-                        @Override
-                        public void onComplete(@NonNull Task<AuthResult> task) {
-
-                            if (task.isSuccessful()) {
-                                progressDialog.dismiss();
-                                Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-                                startActivity(intent);
-                                finish();
-                            } else {
-                                progressDialog.dismiss();
-                                Toast.makeText(LoginActivity.this, task.getException().getLocalizedMessage(), Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-                }
-            }
-        });
-
+        binding.emailBtn.setOnClickListener(v -> performEmailLogin());
 
-        binding.btnLogin.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
 
-                String email = binding.edtEmail.getText().toString();
-                String password = binding.edtPassword.getText().toString();
-
-                if (email.isEmpty()) {
-                    binding.edtEmail.setError(getString(R.string.enter_valid_email));
-                } else if (password.isEmpty()) {
-                    binding.edtPassword.setError(getString(R.string.enter_strong_password));
-                } else {
-
-                    progressDialog.show();
-                    auth.signInWithEmailAndPassword(email, password).addOnCompleteListener(new OnCompleteListener<AuthResult>() {
-                        @Override
-                        public void onComplete(@NonNull Task<AuthResult> task) {
-
-                            if (task.isSuccessful()) {
-                                progressDialog.dismiss();
-                                Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-                                startActivity(intent);
-                                finish();
-                            } else {
-                                progressDialog.dismiss();
-                                Toast.makeText(LoginActivity.this, task.getException().getLocalizedMessage(), Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-                }
-            }
-        });
+        binding.btnLogin.setOnClickListener(v -> performEmailLogin());
 
         binding.forgotPassword.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -160,6 +99,34 @@ public void onClick(View v) {
         googleBtn.setOnClickListener(v -> signInWithGoogle());
     }
 
+    private void performEmailLogin() {
+        String email = binding.edtEmail.getText().toString().trim().toLowerCase(Locale.ROOT);
+        String password = binding.edtPassword.getText().toString();
+
+        if (email.isEmpty()) {
+            binding.edtEmail.setError(getString(R.string.enter_valid_email));
+        } else if (password.isEmpty()) {
+            binding.edtPassword.setError(getString(R.string.enter_strong_password));
+        } else {
+            progressDialog.show();
+            auth.signInWithEmailAndPassword(email, password).addOnCompleteListener(new OnCompleteListener<AuthResult>() {
+                @Override
+                public void onComplete(@NonNull Task<AuthResult> task) {
+                    progressDialog.dismiss();
+                    if (task.isSuccessful()) {
+                        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+                        startActivity(intent);
+                        finish();
+                    } else {
+                        Exception e = task.getException();
+                        String msg = (e != null) ? e.getLocalizedMessage() : getString(R.string.enter_valid_email);
+                        Toast.makeText(LoginActivity.this, msg, Toast.LENGTH_SHORT).show();
+                    }
+                }
+            });
+        }
+    }
+
     void signInWithGoogle() {
         Intent intent = gsc.getSignInIntent();
         startActivityForResult(intent, 1000);
diff --git a/app/src/main/java/com/example/updateapp/views/activites/SignUpActivity.java b/app/src/main/java/com/example/updateapp/views/activites/SignUpActivity.java
index 7829cf7..890fa35 100644
--- a/app/src/main/java/com/example/updateapp/views/activites/SignUpActivity.java
+++ b/app/src/main/java/com/example/updateapp/views/activites/SignUpActivity.java
@@ -20,6 +20,7 @@
 import com.google.firebase.auth.PhoneAuthOptions;
 import com.google.firebase.auth.PhoneAuthProvider;
 
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 public class SignUpActivity extends AppCompatActivity {
@@ -69,9 +70,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void doValidation() {
 
-        String name = binding.edtName.getText().toString();
-        String email = binding.edtEmail.getText().toString();
-        String number = binding.edtMobile.getText().toString();
+        String name = binding.edtName.getText().toString().trim();
+        String email = binding.edtEmail.getText().toString().trim().toLowerCase(Locale.ROOT);
+        String number = binding.edtMobile.getText().toString().trim();
         String password = binding.edtPassword.getText().toString();
 
         if (name.isEmpty()) { binding.edtName.setError(getString(R.string.enter_good_name)); return; }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index ee8dac1..1aa0155 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -73,7 +73,7 @@
                 android:textSize="16sp"
                 android:textColor="#A2A4b5"
                 android:ems="10"
-                android:inputType="textPersonName"
+                android:inputType="textEmailAddress"
                 android:background="@drawable/background_edit" />
 
             <TextView
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 611ecfb..a64b789 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -98,7 +98,7 @@
                 android:textSize="16sp"
                 android:textColor="#A2A4b5"
                 android:ems="10"
-                android:inputType="textPersonName"
+                android:inputType="textEmailAddress"
                 android:background="@drawable/background_edit" />
 
             <TextView
@@ -123,7 +123,7 @@
                 android:textSize="16sp"
                 android:textColor="#A2A4b5"
                 android:ems="10"
-                android:inputType="textPhonetic"
+                android:inputType="phone"
                 android:background="@drawable/background_edit" />
 
             <TextView