Improve checking of sender to no longer rely on name + define user.Send