In both cases, "who" is the correct choice, as you are referring to a person rather than to an object. In common speach, "that" is often used incorrectly in these circumstances by the general public--which includes many TESOL teachers.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.