userprofile: fix up after merge.