Fixed bug #221 user API inconsistencies with data model