Fixes #4932: improve users insertion into inventory