CS and better logging
Fixed sending emails when using friendly names