[TECHNICAL SUPPORT] LPS-30715 Fix User selection problem on non default shard

Hi Laci,

I resend this PR to you based on your comments from #18

I made the rebase and retested the fix again.

If you have any concerns please let me know.

Cheers,
Vili