Fixing users a little bit.
Progress
Merge pull request #2911 from obrignoni/2.3/fix-users-2

2.3/fix users