diff --git a/inc/html.php b/inc/html.php
index 7e120395069f80c5193856c974d0d7629a29eeef..f506a4a0bab2eac89c627114e8a7ed4b7b2759b4 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -775,7 +775,7 @@ function html_conflict($text,$summary){
 
   print p_locale_xhtml('conflict');
   ?>
-  <form name="editform" method="post" action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>">
+  <form id="dw__editform" method="post" action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>">
   <div class="centeralign">
     <input type="hidden" name="id" value="<?php echo $ID?>" />
     <input type="hidden" name="wikitext" value="<?php echo formText($text)?>" />
@@ -819,7 +819,7 @@ function html_register(){
   print p_locale_xhtml('register');
 ?>
   <div class="centeralign">
-  <form name="register" method="post" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>">
+  <form id="dw__register" method="post" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>">
   <fieldset>
     <input type="hidden" name="do" value="register" />
     <input type="hidden" name="save" value="1" />
@@ -878,7 +878,7 @@ function html_updateprofile(){
   if (empty($_POST['email'])) $_POST['email'] = $INFO['userinfo']['mail'];
 ?>
   <div class="centeralign">
-  <form name="register" method="post" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>">
+  <form id="dw__register" method="post" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>">
   <fieldset style="width: 80%;">
     <input type="hidden" name="do" value="profile" />
     <input type="hidden" name="save" value="1" />
@@ -977,7 +977,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
 
   
 ?>
-  <form name="editform" method="post" action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>">
+  <form id="dw__editform" method="post" action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>">
   <table style="width:99%">
     <tr>
       <td class="toolbar" colspan="2">
@@ -1175,7 +1175,7 @@ function html_resendpwd() {
   print p_locale_xhtml('resendpwd');
 ?>
   <div class="centeralign">
-  <form name="resendpwd" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>" method="post">
+  <form id="dw__resendpwd" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>" method="post">
     <fieldset>
       <br />
       <legend><?php echo $lang['resendpwd']?></legend>
diff --git a/inc/template.php b/inc/template.php
index f127888348fa6f75620db401fff41cf4bd9a462e..e9aba3297c414580182b5dd165117c833ef47043 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -491,7 +491,7 @@ function tpl_searchform($ajax=true,$autocomplete=true){
   global $lang;
   global $ACT;
   
-  print '<form action="'.wl().'" accept-charset="utf-8" class="search" name="search"><div class="no">';
+  print '<form action="'.wl().'" accept-charset="utf-8" class="search" id="dw__search"><div class="no">';
   print '<input type="hidden" name="do" value="search" />';
   print '<input type="text" ';
   if($ACT == 'search') print 'value="'.htmlspecialchars($_REQUEST['id']).'" ';
@@ -799,7 +799,7 @@ function tpl_mediauploadform(){
 
   if(!$UPLOADOK) return;
 
-  ptln('<form action="'.DOKU_BASE.'lib/exe/media.php" name="upload"'.
+  ptln('<form action="'.DOKU_BASE.'lib/exe/media.php" id="dw__upload"'.
        ' method="post" enctype="multipart/form-data">',2);
   ptln($lang['txt_upload'].':<br />',4);
   ptln('<input type="file" name="upload" class="edit" onchange="suggestWikiname();" />',4);