Validation changes;

Why you call validateOnAccept?