Fix handling of optional enrollment attributes (CO-868)