2.3/fix users 2

I think we have it. Try it.