Fixing vars after switching to send now mail