Fixes #4434: support for large number of users