Adding a small amount of email/pass checks