Fix email, temporarily disable CP shortcode