Added email/password validation