Expand the default UserPicker template

UserPicker and UserPickerPlus both need to be pulled out of forms, but
for now while they're in here, this is the easiest way to proceed.