Added email validation...