Bug fix for email service command option