Fixed form validation