MDL-26956 user selector: fix regressions sam caused.