diff --git a/modules/content_profile_tokens.module b/modules/content_profile_tokens.module
index 212ab70..fd66753 100644
--- a/modules/content_profile_tokens.module
+++ b/modules/content_profile_tokens.module
@@ -24,6 +24,8 @@ function content_profile_tokens_token_values($type, $object = NULL, $options = a
           $profile = content_profile_load($type_name, $user->uid);
         }
         $fields = content_types($type_name);
+        $values['content-profile-' . $type_name . '-node-title'] = check_plain($profile->title);
+        $values['content-profile-' . $type_name . '-node-title-raw'] = $profile->title;
         foreach ($fields['fields'] as $field_name => $field) {
           if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
               $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
@@ -66,6 +68,8 @@ function content_profile_tokens_token_list($type = 'all') {
     foreach ($types as $type_name => $type) {
     
       $fields = content_types($type_name);
+      $tokens['user']['content-profile-'. $type_name .'-node-title'] = t($fields['description']) .'- Profile Node Title (First Name) ';
+      $tokens['user']['content-profile-'. $type_name .'-node-title-raw'] = t($fields['description']) .' - Profile Node Title (First Name) '. t('WARNING - raw user input');
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
           $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);