Bug fixes in the UserMailer