diff --git a/dfp.admin.inc b/dfp.admin.inc
index eda67a7..42d30bf 100644
--- a/dfp.admin.inc
+++ b/dfp.admin.inc
@@ -277,12 +277,15 @@ function _dfp_targeting_form(&$targeting_form, $existing_targeting = array()) {
       'file' => 'plugins/export_ui/dfp_ctools_export_ui.inc',
     ),
   );
-  $targeting_form['tokens'] = array(
-    '#theme' => 'token_tree',
-    '#token_types' => array('dfp_tag', 'node', 'term', 'user'), // The token types that have specific context. Can be multiple token types like 'term' and/or 'user'
-    '#global_types' => TRUE, // A boolean TRUE or FALSE whether to include 'global' context tokens like [current-user:*] or [site:*]. Defaults to TRUE.
-    '#click_insert' => TRUE, // A boolean whether to include the 'Click this token to insert in into the the focused textfield' JavaScript functionality. Defaults to TRUE.
-  );
+  if (module_exists('token')) {
+    $targeting_form['tokens'] = array(
+      '#theme' => 'token_tree',
+      '#token_types' => array('dfp_tag', 'node', 'term', 'user'), // The token types that have specific context. Can be multiple token types like 'term' and/or 'user'
+      '#global_types' => TRUE, // A boolean TRUE or FALSE whether to include 'global' context tokens like [current-user:*] or [site:*]. Defaults to TRUE.
+      '#click_insert' => TRUE, // A boolean whether to include the 'Click this token to insert in into the the focused textfield' JavaScript functionality. Defaults to TRUE.
+    );
+  }
+
 }
 
 /**
diff --git a/dfp.install b/dfp.install
index b58979a..f9656b2 100644
--- a/dfp.install
+++ b/dfp.install
@@ -6,6 +6,17 @@
  */
 
 /**
+ * Implements hook_enable().
+ */
+function dfp_enable() {
+  $t = get_t();
+
+  if (!module_exists('token')) {
+    drupal_set_message($t('While it is not required, the Doubleclick for Publishers administration forms are vastly improved by using the <a href="!url">token module</a>.', array('!url' => 'http://drupal.org/project/token')));
+  }
+}
+
+/**
  * Implements hook_schema().
  */
 function dfp_schema() {
@@ -123,6 +134,8 @@ function dfp_install() {
  * the any DFP global settings that have already been set.
  */
 function dfp_update_7000() {
+  $t = get_t();
+
   if (module_exists('dart')) {
     // Migrate global settings.
     $network_id = variable_get('dart_global_network_id', '');
@@ -198,9 +211,26 @@ function dfp_update_7000() {
           ->execute();
       }
     }
-    return t('All DART tags and settings have been migrated to coresponding DFP tags and settings. It is highly recomended that you uninstall the DART module.');
+    return $t('All DART tags and settings have been migrated to coresponding DFP tags and settings. It is highly recomended that you uninstall the DART module.');
   }
 }
 
+/**
+ * The network id is now included automatically in the ad unit pattern therefore
+ * existing tags need the ad unit id token removed so it doesnt appear twice.
+ */
+function dfp_update_7001() {
+  $t = get_t();
+
+  $tags = db_select('dfp_tags', 'd')->fields('d')->execute();
 
+  foreach ($tags as $tag) {
+    if (strpos($tag->adunit, '[dfp_tag:network_id]/') === 0) {
+      $tag->adunit = str_replace('[dfp_tag:network_id]/', '', $tag->adunit);
+      $record = array('adid' => $tag->adid, 'adunit' => $tag->adunit);
+      drupal_write_record('dfp_tags', $record, 'adid');
+    }
+  }
 
+  return $t('The [dfp_tag:network_id] token has been removed from the beginning of the Ad Unit Pattern for all tags because it is now automatically included.');
+}
diff --git a/dfp.module b/dfp.module
index 3a16f71..2ae78f2 100644
--- a/dfp.module
+++ b/dfp.module
@@ -358,6 +358,9 @@ function dfp_tag_load($machinename) {
     // Allow modules to alter the raw tag object.
     drupal_alter('dfp_tag_load', $tag);
 
+    // Prepend the network id to the ad unit pattern.
+    $tag->adunit = '[dfp_tag:network_id]/' . $tag->adunit;
+
     // Move the settings out of the settings array.
     foreach ($tag->settings as $key => $val) {
       $tag->{$key} = $val;
diff --git a/plugins/export_ui/dfp_ctools_export_ui.inc b/plugins/export_ui/dfp_ctools_export_ui.inc
index 919e27e..262cb40 100644
--- a/plugins/export_ui/dfp_ctools_export_ui.inc
+++ b/plugins/export_ui/dfp_ctools_export_ui.inc
@@ -103,7 +103,7 @@ function dfp_tag_form(&$form, &$form_state) {
     '#required' => FALSE,
     '#maxlength' => 64,
     '#default_value' => $tag->adunit,
-    '#description' => t('Use the tokens below to define how the ad unit should display. You can programatically alter this value during any page request. Example: [dfp_tag:network_id]/[dfp_tag:url_parts:4]/[dfp_tag:slot]'),
+    '#description' => t('Use the tokens below to define how the ad unit should display. The network id will be included automatically. Example: [dfp_tag:url_parts:4]/[dfp_tag:slot]'),
   );
   $form['tag_settings']['tokens'] = array(
     '#theme' => 'token_tree',