diff --git a/modules/content_profile_tokens.module b/modules/content_profile_tokens.module
index e9b858b..80be123 100644
--- a/modules/content_profile_tokens.module
+++ b/modules/content_profile_tokens.module
@@ -26,7 +26,7 @@ function content_profile_tokens_token_values($type, $object = NULL, $options = a
         }
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number' || $field['widget']['type'] == 'optionwidgets_select')) {
               $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
               $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
           }
@@ -68,7 +68,7 @@ function content_profile_tokens_token_list($type = 'all') {
     
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
-        if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+        if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number' || $field['widget']['type'] == 'optionwidgets_select')) {
           $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
           $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
         }