Fix to validate differently on create vs update