Fix idempotency in users script