Added form fields validation