Re-added form validations