OPAL-2537 - removed TODO, extract user's when updating