Fixing user management API