Adding additional form validation