diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 2c02ace19..8d3147ac3 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -30,6 +30,8 @@
  - Changed the page templates to float better in IE.
  - Fixed a bug that caused the page layout template not to change immediately
    upon an edit.
+ - fix [ 1240899 ] File Upload Control strangeness in IE under XHTML
+ - fix [ 1208496 ] Link to a page in WebGUI broken on IE - Done button broken.
 
 
 6.7.1
diff --git a/docs/upgrades/upgrade_6.7.1-6.7.2.pl b/docs/upgrades/upgrade_6.7.1-6.7.2.pl
index cc95aeeaf..a2d226d07 100644
--- a/docs/upgrades/upgrade_6.7.1-6.7.2.pl
+++ b/docs/upgrades/upgrade_6.7.1-6.7.2.pl
@@ -752,7 +752,7 @@ sub speedUpAdminConsole {
 <div id="console_icon">
      <img src="<tmpl_var console.icon>" border="0" title="<tmpl_var console.title>" alt="<tmpl_var console.title>" />
 </div>
-<script lang="JavaScript">
+<script type="text/javascript">
   initAdminConsole(<tmpl_if application.title>true<tmpl_else>false</tmpl_if>,<tmpl_if submenu_loop>true<tmpl_else>false</tmpl_if>);
 </script>
 
diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index e618d949b..f19cf4e26 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -52,7 +52,6 @@ sub www_richEditPageTree {
 		-name=>"url",
 		-label=>WebGUI::International::get(104),
 		-hoverHelp=>WebGUI::International::get('104 description'),
-		-extras=>'id="url"'
 		);
 	$f->selectList(
 		-name=>"target",
@@ -60,7 +59,6 @@ sub www_richEditPageTree {
 		-hoverHelp=>WebGUI::International::get('target description'),
 		-options=>{"_self"=>WebGUI::International::get('link in same window'),
 		           "_blank"=>WebGUI::International::get('link in new window')},
-		-extras=>'id="target"'
 		);
 	$f->button(
 		-value=>WebGUI::International::get('done'),
@@ -72,11 +70,11 @@ sub www_richEditPageTree {
 	<script language="javascript">
 function createLink() {
     if (window.opener) {        
-        if (document.getElementById("url").value == "") {
-           alert('.WebGUI::International::get("link enter alert").');
-           document.getElementById("url").focus();
+        if (document.getElementById("url_formId").value == "") {
+           alert("'.WebGUI::International::get("link enter alert").'");
+           document.getElementById("url_formId").focus();
         }
-window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url").value,document.getElementById("target").value);
+window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url_formId").value,document.getElementById("target_formId").value);
      window.close();
     }
 }
@@ -91,7 +89,7 @@ window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url"
 	my $children = $base->getLineage(["children"],{returnObjects=>1});
 	foreach my $child (@{$children}) {
 		next unless $child->canView;
-		$output .= '<a href="#" onclick="document.getElementById(\'url\').value=\''.$child->get("url").'\'">(&bull;)</a> <a href="'.$child->getUrl("op=richEditPageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n";	
+		$output .= '<a href="#" onclick="document.getElementById(\'url_formId\').value=\''.$child->get("url").'\'">(&bull;)</a> <a href="'.$child->getUrl("op=richEditPageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n";	
 	}
 	$session{page}{useEmptyStyle} = 1;
 	return $output.'</fieldset></fieldset>';