More tweaks to the unified user API