ENYO-2254: handle unique ID managed by user