Fix user collection schema