Fix bug with wrong user being emailed