--- content_taxonomy.module.old	2008-12-23 22:02:59.000000000 +0100
+++ content_taxonomy.module	2008-12-23 22:18:19.000000000 +0100
@@ -37,6 +37,9 @@ function content_taxonomy_theme() {
     'content_taxonomy_formatter_link' => array(
       'arguments' => array('element' => NULL),
     ),
+    'content_taxonomy_optionwidgets_none' => array(
+      'arguments' => array('field' => NULL),
+    ),
   );
 }
 
@@ -225,6 +228,20 @@ function theme_content_taxonomy_formatte
 }
 
 /**
+ *  Theme the label for the empty value for options that are not required.
+ */
+function theme_content_taxonomy_optionwidgets_none($field) {
+  switch ($field['widget']['type']) {
+    case 'content_taxonomy_options':
+      return t('N/A');
+    case 'content_taxonomy_select':
+      return t('- None -');
+    default :
+      return '';
+  }
+}
+
+/**
  * Implementation of hook_content_is_empty().
  */
 function content_taxonomy_content_is_empty($item, $field) {
@@ -261,8 +278,8 @@ function content_taxonomy_allowed_values
       $options[$term->tid] = ($field['widget']['type'] == 'content_taxonomy_select') ? $value : check_plain($value);
     }
   }
-  if ((!$field['required'] && !$field['multiple']) || ($field['widget']['type'] == 'content_taxonomy_select' && !$field['multiple'])) {
-    $options = array('' => theme('optionwidgets_none', $field)) + $options;
+  if ((!$field['required'] && !$field['multiple']) || ($field['widget']['type'] == 'content_taxonomy_select' && !$field['multiple']) || ($field['widget']['type'] == 'content_taxonomy_options' && !$field['multiple'])) {
+    $options = array('' => theme('content_taxonomy_optionwidgets_none', $field)) + $options;
   }
   return $options;
 }