Consistent fix with non-API version

Also with test
Merge pull request #1 from ares/user-admin-fix

Consistent fix with non-API version