Added more protection to Form Validation / Server side validation