diff --git a/dreditor.user.js b/dreditor.user.js
index 4ec329c..a3534ec 100644
--- a/dreditor.user.js
+++ b/dreditor.user.js
@@ -1373,28 +1373,25 @@ Drupal.behaviors.dreditorIssueSummaryTemplate = function (context) {
     var $action = $('<a>')
       .attr('href', '#')
       .appendTo($label)
-      .text("Insert template")
+      .text('Insert template')
       .attr('class', 'dreditor-button')
       .click(function () {
-        // Load the issue summary instructions.
-        $.get('http://drupal.org/node/1155816', function (data) {
-          // We need the first codeblock to extract the template.
-          var $template = $(data).find('div.codeblock:first > code');
-          var $templateText = $template.text();
-
-          // Insert blank lines and strip parenthetical comments.
-          $templateText = $templateText.replace(/<\/h3>/g, "</h3>\n\n\n").replace(/\(.*\)/g, "").replace(/\/\/.*\./,"");
 
-          // Prepend text to current body.
-          $('#edit-body').val($templateText + $('#edit-body').val());
+        // Load the issue summary instructions.
+        $.get('http://drupal.org/node/1326662', function (data) {
 
-          // If we are editing a new issue, remove the "original report" header.
+          // If we are on a node add page, use that version of the template.
           if (location.pathname.search('node/add') >= 0) {
-            $('#edit-body').val($('#edit-body').val().replace(/<h3 id=\"summary-original-report\">.*<\/h3>/, ''));
+            var $templateText = $(data).find('div#node-add-template').text();
           }
-          // Otherwise, try to add a link to the original poster's profile.
+
+          // Otherwise, use the template for the node edit form.
           else {
-            // Try to find a path to the node from the URL.
+            var $templateText = $(data).find('div#node-edit-template').text();
+
+            // Replace [username] with a link to the original poster's profile.
+            // To find the original poster, try to find a path to the node
+            // from the URL.
             var nodePath = location.href.match(/^.*node\/[0-9]*/);
 
             // Only proceed if a valid node path was found.
@@ -1404,23 +1401,30 @@ Drupal.behaviors.dreditorIssueSummaryTemplate = function (context) {
                 // Find the link to the original poster's profile.
                 var $profileLink = $(data).find('div.node > div.submitted a');
 
-                // Assemble markup for a link and insert it in the summary template.
+                // Assemble and insert markup for a profile link.
                 var profileLinkMarkup = '<a href="' + link.attr('href') + '">' + $profileLink.html() + '</a>';
-                $('#edit-body').val($('#edit-body').val().replace(/\[username\]/, profileLinkMarkup));
+                $templateText = $templateText.replace(/\[username\]/, profileLinkMarkup);
               });
             }
           }
+
+          $templateText = $templateText.replace(/<\/h3>/g, "</h3>\n\n");
+
+          // Prepend text to current body.
+          $('#edit-body').val($templateText + $('#edit-body').val());
         });
+
+        // Take no action other than executing the .click() behavior.
         return false;
       }
     );
+
+    // Add spacing around the button.
     $action.wrap('<span>&nbsp;&nbsp;</span>');
 
     // Add a link to view the issue summary instructions.
-    var $instructions = $('<a>')
-      .attr('href', 'http://drupal.org/node/1155816')
-      .appendTo($label)
-      .text("Issue summary standards");
+    var $instructions = $('<a href="http://drupal.org/node/1155816" target="_blank">Issue summary standards</a>')
+    .appendTo($label);
     $instructions.before('(');
     $instructions.after(')');
   });