finalise form_identifier change