Follow-up from "Fix initial user selection after search"

The following discussion from !162776 (merged) should be addressed: