Added isPassword and isEmailValid