Users service - fix