Add form validation and ensure to match database requirements