(UserManagement) Review followup, API fixes