Fix confirmation/waiting emails