diff --git a/nodereference_url.module b/nodereference_url.module
index 1efc90e..8fa30e5 100644
--- a/nodereference_url.module
+++ b/nodereference_url.module
@@ -158,6 +158,12 @@ function nodereference_url_build_link($node, $field, $teaser = FALSE, $alt_forma
           $link['query']['destination'] = drupal_get_path_alias('node/'. $node->nid);
         }
       }
+      if (module_exists('token')) {
+        $link['title'] = token_replace($link['title'], 'node', $node);
+        if (!empty($link['attributes']['title'])) {
+           $link['attributes']['title'] = token_replace($link['attributes']['title'], 'node', $node);
+        }
+      }
       if (module_exists('og')) {
         // First try to get context based on the current page URL.
         $group_node = og_get_group_context();
@@ -315,6 +321,22 @@ function nodereference_url_field_widget_settings_form($widget) {
       '#default_value' => isset($settings['node_link']['hover_title']) ? $settings['node_link']['hover_title'] : '',
       '#description' => t('Text shown while hovering over the link.'),
     );
+        
+    if (module_exists('token')) {
+      $form['node_link']['token_replacements'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Replacements for link title & hover title'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+      );
+          
+      $form['node_link']['token_replacements']['table'] = array(
+	'#value' => theme('token_help', array('node')),
+      );
+          
+ $form['node_link']['title']['#default_value'] = isset($widget['node_link']['title']) ? $widget['node_link']['title'] : t('Add a new [target-type] to this [type]');
+        }
+
     $form['node_link']['destination'] = array(
       '#type' => 'select',
       '#title' => t('Return path'),