Users collection: simplified code !fix