Added more form validation conditions