Fixup user completion