diff --git a/webtools/doctor/templates/review.tmpl b/webtools/doctor/templates/review.tmpl
index 868948dfcf13..c1fb71d2c6f2 100644
--- a/webtools/doctor/templates/review.tmpl
+++ b/webtools/doctor/templates/review.tmpl
@@ -79,8 +79,8 @@
 
       <p>
         Don't have a CVS account?
-        <a href="http://bugzilla.mozilla.org/enter_bug.cgi?product=mozilla.org&component=CVS+Account+Request&version=other&rep_platform=All&op_sys=All&short_desc=webtree+CVS+account+for+%3Cyour+name+here%3E+-+%3Cyour+email+address+here%3E&comment=%3CEnter+a+description+of+what+you+would+like+to+edit+on+the+web+site+here.++Note%0D%0Athat+you+need+someone+who+already+has+access+to+vouch+for+you.%3E">File a bug report about getting one</a>
-        or save your changes as a file on your computer, <a href="http://bugzilla.mozilla.org/enter_bug.cgi?product=mozilla.org&component=webmaster@mozilla.org&version=other&rep_platform=All&op_sys=All&bug_file_loc=[% file_url FILTER html %]&short_desc=%3CSummarize+your+changes+here.%3E&comment=%3CDescribe+your+changes+here+in+more+detail.++After+you+commit+this+bug+report%2C%0D%0Aclick+the+%22Create+Attachment%22+link+to+add+the+changes+to+the+report+as+an%0D%0Aattachment.%3E">file a bug report about them</a> (assign it to the page's owner if you can figure out who that is from the <a href="http://www.mozilla.org/webtools/bonsai/cvslog.cgi?file=[% file FILTER html %]">change log</a>), then attach the changes to the bug report.
+        <a href="http://bugzilla.mozilla.org/enter_bug.cgi?format=__default__&product=mozilla.org&component=CVS+Account+Request&version=other&rep_platform=All&op_sys=All&short_desc=webtree+CVS+account+for+%3Cyour+name+here%3E+-+%3Cyour+email+address+here%3E&comment=%3CEnter+a+description+of+what+you+would+like+to+edit+on+the+web+site+here.++Note%0D%0Athat+you+need+someone+who+already+has+access+to+vouch+for+you.%3E">File a bug report about getting one</a>
+        or save your changes as a file on your computer, <a href="http://bugzilla.mozilla.org/enter_bug.cgi?format=__default__&product=mozilla.org&component=webmaster@mozilla.org&version=other&rep_platform=All&op_sys=All&bug_file_loc=[% file_url FILTER html %]&short_desc=%3CSummarize+your+changes+here.%3E&comment=%3CDescribe+your+changes+here+in+more+detail.++After+you+commit+this+bug+report%2C%0D%0Aclick+the+%22Create+Attachment%22+link+to+add+the+changes+to+the+report+as+an%0D%0Aattachment.%3E">file a bug report about them</a> (assign it to the page's owner if you can figure out who that is from the <a href="http://www.mozilla.org/webtools/bonsai/cvslog.cgi?file=[% file FILTER html %]">change log</a>), then attach the changes to the bug report.
       </p>
 
     </form>