diff --git a/mozilla/editor/ui/dialogs/content/EdAEAttributes.js b/mozilla/editor/ui/dialogs/content/EdAEAttributes.js
index 1140821760f..fd50902c389 100644
--- a/mozilla/editor/ui/dialogs/content/EdAEAttributes.js
+++ b/mozilla/editor/ui/dialogs/content/EdAEAttributes.js
@@ -113,10 +113,10 @@ var gVAlignTable =
 
 var gTarget =
 [
-  "blank",
-  "self",
-  "parent",
-  "top"
+  "_blank",
+  "_self",
+  "_parent",
+  "_top"
 ];
 
 // ================ HTML Attributes ================ //
diff --git a/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js b/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
index 04b4e8a87fc..6da3dd23a8a 100644
--- a/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
+++ b/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
@@ -77,8 +77,8 @@ function BuildHTMLAttributeNameList()
         limitFirstChar = name.indexOf("\^") >= 0;
         //var required = name.indexOf("$") >= 0;
 
-        // Strip flag characters ("_" is used when attribute name is reserved JS word)
-        name = name.replace(/[!^#%$_+]/g, "");
+        // Strip flag characters
+        name = name.replace(/[!^#%$+]/g, "");
 
         menuitem = AppendStringToMenulist(dialog.AddHTMLAttributeNameInput, name);
         if (menuitem)
@@ -161,7 +161,6 @@ function ClearHTMLInputWidgets()
 
 function onSelectHTMLTreeItem()
 {
-dump(" ** Calling onSelectHTMLTreeItem gDoOnSelectTree="+gDoOnSelectTree+"\n");
   if (!gDoOnSelectTree)
     return;
 
@@ -188,7 +187,6 @@ dump(" ** Calling onSelectHTMLTreeItem gDoOnSelectTree="+gDoOnSelectTree+"\n");
 
 function onInputHTMLAttributeName()
 {
-dump(" ** Calling onInputHTMLAttributeName\n");
   var attName = TrimString(dialog.AddHTMLAttributeNameInput.value).toLowerCase();
 
   // Clear value widget, but prevent triggering update in tree
@@ -292,8 +290,6 @@ function onInputHTMLAttributeValue()
     //  to avoid multiple reseting of input's value and flickering)
     var selectedItem = dialog.AddHTMLAttributeNameInput.selectedItem;
 
-dump("*** onInputHTMLAttributeValue: selectedItem="+selectedItem+"\n");
-
     if (selectedItem)
     {
       if ( selectedItem.getAttribute("forceOneChar") == "true" &&