Bug Fix - Create/Edit form validation