diff --git a/includes/context.inc b/includes/context.inc
index cac5bb9..c5443d4 100644
--- a/includes/context.inc
+++ b/includes/context.inc
@@ -498,7 +498,7 @@ function ctools_context_get_all_converters() {
 /**
  * Let the context convert an argument based upon the converter that was given.
  */
-function ctools_context_convert_context($context, $converter) {
+function ctools_context_convert_context($context, $converter, $converter_options = array()) {
   // Contexts without plugins might be optional placeholders.
   if (empty($context->plugin)) {
     return;
@@ -507,12 +507,12 @@ function ctools_context_convert_context($context, $converter) {
   $value = $context->argument;
   $plugin = ctools_get_context($context->plugin);
   if ($function = ctools_plugin_get_function($plugin, 'convert')) {
-    $value = $function($context, $converter);
+    $value = $function($context, $converter, $converter_options);
   }
 
   foreach (module_implements('ctools_context_converter_alter') as $module) {
     $function = $module . '_ctools_context_converter_alter';
-    $function($context, $converter, $value);
+    $function($context, $converter, $value, $converter_options);
   }
 
   return $value;
@@ -608,7 +608,7 @@ function ctools_context_create_empty($type) {
 /**
  * Perform keyword and context substitutions.
  */
-function ctools_context_keyword_substitute($string, $keywords, $contexts) {
+function ctools_context_keyword_substitute($string, $keywords, $contexts, $converter_options = array()) {
   // Ensure a default keyword exists:
   $keywords['%%'] = '%';
 
@@ -643,19 +643,17 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts) {
         $context = $keyword;
         if (isset($context_keywords[$keyword])) {
           $plugin = ctools_get_context($context_keywords[$context]->plugin);
-
           // Fall back to a default converter, if specified.
           if ($plugin && !empty($plugin['convert default'])) {
             $converter = $plugin['convert default'];
           }
         }
       }
-
       if (empty($context_keywords[$context]) || !empty($context_keywords[$context]->empty)) {
         $keywords['%' . $keyword] = '';
       }
       else if (!empty($converter)) {
-        $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter);
+        $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter, $converter_options);
       }
       else {
         $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
diff --git a/plugins/contexts/entity.inc b/plugins/contexts/entity.inc
index 3915667..7ac2c42 100644
--- a/plugins/contexts/entity.inc
+++ b/plugins/contexts/entity.inc
@@ -242,7 +242,7 @@ function ctools_context_entity_convert_list($plugin) {
 /**
  * Convert a context into a string.
  */
-function ctools_context_entity_convert($context, $type) {
+function ctools_context_entity_convert($context, $type, $options = array()) {
   $entity_type = $context->type[2];
   $entity = entity_get_info($entity_type);
 
@@ -260,8 +260,9 @@ function ctools_context_entity_convert($context, $type) {
   }
 
   $tokens = token_info();
+  $options += array('sanitize' => FALSE);
 
-  $values = token_generate($token, array($type => $type), array($token => $context->data));
+  $values = token_generate($token, array($type => $type), array($token => $context->data), $options);
   if (isset($values[$type])) {
     return $values[$type];
   }