[stable-3.16] always set a user if we got asked for one

[stable-3.16] always set a user if we got asked for one #2466