Fix user lists handling