Correct as you have it. As I mentioned in a similar response earlier, 'who' may be gaining some ground in these contexts. Albeit correct, it may appear 'weird' because it sounds somewhat stilted.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.