Small changes to enable sender.user, however it complicates code further.