diff --git a/db_details.php3 b/db_details.php3
index 8b9051845..150113805 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -181,10 +181,10 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
         ?>
 <tr>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-        <input type="checkbox" name="selected_tbl[]" value="<?php echo urlencode($table); ?>"<?php echo $checked; ?> />
+        <input type="checkbox" name="selected_tbl[]" value="<?php echo urlencode($table); ?>" id="checkbox_tbl_<?php echo urlencode($table); ?>"<?php echo $checked; ?> />
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
-        &nbsp;<b><?php echo htmlspecialchars($table); ?>&nbsp;</b>&nbsp;
+        &nbsp;<b><label for="checkbox_tbl_<?php echo urlencode($table); ?>"><?php echo htmlspecialchars($table); ?></label>&nbsp;</b>&nbsp;
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
         <?php
@@ -427,10 +427,10 @@ else {
         ?>
 <tr>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-        <input type="checkbox" name="selected_tbl[]" value="<?php echo urlencode($tables[$i]); ?>"<?php echo $checked; ?> />
+        <input type="checkbox" name="selected_tbl[]" value="<?php echo urlencode($tables[$i]); ?>" id="checkbox_tbl_<?php echo urlencode($tables[$i]); ?>"<?php echo $checked; ?> />
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>" class="data">
-        <b>&nbsp;<?php echo $tables[$i]; ?>&nbsp;</b>
+        <b>&nbsp;<label for="checkbox_tbl_<?php echo urlencode($table); ?>"><?php echo $tables[$i]; ?></label>&nbsp;</b>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
         <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($tables[$i])); ?>&amp;pos=0"><?php echo $strBrowse; ?></a>
@@ -558,8 +558,8 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
     onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.form.elements['sql_query'].select();}">
 <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : ''); ?>
 </textarea><br />
-            <input type="checkbox" name="show_query" value="y" checked="checked" />&nbsp;
-                <?php echo $strShowThisQuery; ?><br />
+            <input type="checkbox" name="show_query" value="y" id="checkbox_show_query" checked="checked" />&nbsp;
+                <label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label><br />
             </div>
 <?php
 // loic1: displays import dump feature only if file upload available
@@ -584,9 +584,9 @@ if ($cfgBookmark['db'] && $cfgBookmark['table']) {
             echo '                <option value="' . $value . '">' . htmlentities($key) . '</option>' . "\n";
         }
         echo '            </select>' . "\n";
-        echo '            <input type="radio" name="action_bookmark" value="0" checked="checked" style="vertical-align: middle" />' . $strSubmit . "\n";
-        echo '            &nbsp;<input type="radio" name="action_bookmark" value="1" style="vertical-align: middle" />' . $strBookmarkView . "\n";
-        echo '            &nbsp;<input type="radio" name="action_bookmark" value="2" style="vertical-align: middle" />' . $strDelete . "\n";
+        echo '            <input type="radio" name="action_bookmark" value="0" id="radio_bookmark0" checked="checked" style="vertical-align: middle" /><label for="radio_bookmark0">' . $strSubmit . '</label>' . "\n";
+        echo '            &nbsp;<input type="radio" name="action_bookmark" value="1" id="radio_bookmark1" style="vertical-align: middle" /><label for="radio_bookmark1">' . $strBookmarkView . '</label>' . "\n";
+        echo '            &nbsp;<input type="radio" name="action_bookmark" value="2" id="radio_bookmark2" style="vertical-align: middle" /><label for="radio_bookmark2">' . $strDelete . '</label>' . "\n";
         echo '            <br />' . "\n";
         echo '            </div>' . "\n";
     }
@@ -650,12 +650,12 @@ if ($num_tables > 0) {
     echo "\n";
     ?>
             <td valign="middle">
-                <input type="radio" name="what" value="structure" checked="checked" />
-                <?php echo $strStrucOnly; ?><br />
-                <input type="radio" name="what" value="data" />
-                <?php echo $strStrucData; ?><br />
-                <input type="radio" name="what" value="dataonly" />
-                <?php echo $strDataOnly; ?>
+                <input type="radio" name="what" value="structure" id="radio_dump_structure" checked="checked" />
+                <label for="radio_dump_structure"><?php echo $strStrucOnly; ?></label><br />
+                <input type="radio" name="what" id="radio_dump_data" value="data" />
+                <label for="radio_dump_data"><?php echo $strStrucData; ?></label><br />
+                <input type="radio" name="what" id="radio_dump_dataonly" value="dataonly" />
+                <label for="radio_dump_dataonly"><?php echo $strDataOnly; ?></label>
     <?php
     if ($num_tables > 1) {
         echo "\n";
@@ -672,20 +672,20 @@ if ($num_tables > 0) {
         </tr>
         <tr>
             <td<?php echo $colspan; ?>>
-                <input type="checkbox" name="drop" value="1" />
-                <?php echo $strStrucDrop . "\n"; ?>
+                <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" />
+                <label for="checkbox_dump_drop"><?php echo $strStrucDrop; ?></label>
             </td>
         </tr>
         <tr>
             <td<?php echo $colspan; ?>>
-                <input type="checkbox" name="showcolumns" value="yes" />
-                <?php echo $strCompleteInserts . "\n"; ?>
+                <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" />
+                <label for="checkbox_dump_showcolumns"><?php echo $strCompleteInserts; ?></label>
             </td>
         </tr>
         <tr>
             <td<?php echo $colspan; ?>>
-                <input type="checkbox" name="extended_ins" value="yes" />
-                <?php echo $strExtendedInserts . "\n"; ?>
+                <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" />
+                <label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label>
             </td>
         </tr>
     <?php
@@ -694,8 +694,8 @@ if ($num_tables > 0) {
         ?>
         <tr>
             <td<?php echo $colspan; ?>>
-                <input type="checkbox" name="use_backquotes" value="1" />
-                <?php echo $strUseBackquotes . "\n"; ?>
+                <input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" />
+                <label for="checkbox_dump_use_backquotes"><?php echo $strUseBackquotes; ?></label>
             </td>
         </tr>
         <?php
@@ -704,8 +704,8 @@ if ($num_tables > 0) {
     ?>
         <tr>
             <td<?php echo $colspan; ?>>
-                <input type="checkbox" name="asfile" value="sendit" onclick="return checkTransmitDump(this.form, 'transmit')" />
-                <?php echo $strSend . "\n"; ?>
+                <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" onclick="return checkTransmitDump(this.form, 'transmit')" />
+                <label for="checkbox_dump_asfile"><?php echo $strSend; ?></label>
     <?php
     // gzip and bzip2 encode features
     if (PMA_PHP_INT_VERSION >= 40004) {
@@ -716,19 +716,22 @@ if ($num_tables > 0) {
             echo "\n" . '                (' . "\n";
             if ($is_zip) {
                 ?>
-                <input type="checkbox" name="zip" value="zip" onclick="return checkTransmitDump(this.form, 'zip')" /><?php echo $strZip . (($is_gzip || $is_bzip) ? '&nbsp;' : '') . "\n"; ?>
+                <input type="checkbox" name="zip" value="zip" id="checkbox_dump_zip" onclick="return checkTransmitDump(this.form, 'zip')" />
+                <?php echo '<label for="checkbox_dump_zip">' . $strZip . '</label>' . (($is_gzip || $is_bzip) ? '&nbsp;' : '') . "\n"; ?>
                 <?php
             }
             if ($is_gzip) {
                 echo "\n"
                 ?>
-                <input type="checkbox" name="gzip" value="gzip" onclick="return checkTransmitDump(this.form, 'gzip')" /><?php echo $strGzip . (($is_bzip) ? '&nbsp;' : '') . "\n"; ?>
+                <input type="checkbox" name="gzip" value="gzip" id="checkbox_dump_gzip" onclick="return checkTransmitDump(this.form, 'gzip')" />
+                <?php echo '<label for="checkbox_dump_gzip">' . $strGzip . '</label>' . (($is_bzip) ? '&nbsp;' : '') . "\n"; ?>
                 <?php
             }
             if ($is_bzip) {
                 echo "\n"
                 ?>
-                <input type="checkbox" name="bzip" value="bzip" onclick="return checkTransmitDump(this.form, 'bzip')" /><?php echo $strBzip . "\n"; ?>
+                <input type="checkbox" name="bzip" value="bzip" id="checkbox_dump_bzip" onclick="return checkTransmitDump(this.form, 'bzip')" />
+                <?php echo '<label for="checkbox_dump_bzip">' . $strBzip . '</label>' . "\n"; ?>
                 <?php
             }
             echo "\n" . '                )';
diff --git a/tbl_change.php3 b/tbl_change.php3
index 8093d8515..7df7242f4 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -370,14 +370,14 @@ for ($i = 0; $i < $fields_cnt; $i++) {
                 // Removes automatic MySQL escape format
                 $enum_atom = str_replace('\'\'', '\'', str_replace('\\\\', '\\', $enum[$j]));
                 echo '            ';
-                echo '<input type="radio" name="field_' . md5($field) . '[]" value="' . urlencode($enum_atom) . '"' . ' onclick="if (typeof(document.forms[\'insertForm\'].elements[\'fields_null[' . urlencode($field) . ']\']) != \'undefined\') {document.forms[\'insertForm\'].elements[\'fields_null[' . urlencode($field) .']\'].checked = false}"';
+                echo '<input type="radio" name="field_' . md5($field) . '[]" value="' . urlencode($enum_atom) . '" id="radio_field_' . md5($field) . '_' . urlencode($enum_atom) . '" onclick="if (typeof(document.forms[\'insertForm\'].elements[\'fields_null[' . urlencode($field) . ']\']) != \'undefined\') {document.forms[\'insertForm\'].elements[\'fields_null[' . urlencode($field) .']\'].checked = false}"';
                 if ($data == $enum_atom
                     || ($data == '' && (!isset($primary_key) || $row_table_def['Null'] != 'YES')
                         && isset($row_table_def['Default']) && $enum_atom == $row_table_def['Default'])) {
                     echo ' checked="checked"';
                 }
                 echo 'tabindex="' . $i . '" />' . "\n";
-                echo '            ' . htmlspecialchars($enum_atom) . "\n";
+                echo '            <label for="radio_field_' . md5($field) . '_' . urlencode($enum_atom) . '">' . htmlspecialchars($enum_atom) . '</label>' . "\n";
             } // end for
 
         } // end else
@@ -489,9 +489,9 @@ echo "\n";
 <?php
 if (isset($primary_key)) {
     ?>
-            <input type="radio" name="submit_type" value="<?php echo $strSave; ?>" checked="checked" tabindex="<?php echo $fields_cnt+1; ?>" /><?php echo $strSave; ?><br />
+            <input type="radio" name="submit_type" value="<?php echo $strSave; ?>" id="radio_submit_type_save" checked="checked" tabindex="<?php echo $fields_cnt+1; ?>" /><label for="radio_submit_type_save"><?php echo $strSave; ?></label><br />
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strOr; ?><br />
-            <input type="radio" name="submit_type" value="<?php echo $strInsertAsNewRow; ?>" tabindex="<?php echo $fields_cnt+2; ?>" /><?php echo $strInsertAsNewRow. "\n"; ?>
+            <input type="radio" name="submit_type" value="<?php echo $strInsertAsNewRow; ?>" id="radio_submit_type_insert_as_new_row" tabindex="<?php echo $fields_cnt+2; ?>" /><label for="radio_submit_type_insert_as_new_row"><?php echo $strInsertAsNewRow; ?></label>
     <?php
 } else {
     echo "\n";
@@ -511,9 +511,9 @@ $checked = (!empty($message)) ? ' checked="checked"' : '';
             &nbsp;&nbsp;&nbsp;<b>-- <?php echo $strAnd; ?> --</b>&nbsp;&nbsp;&nbsp;
         </td>
         <td valign="middle" nowrap="nowrap">
-            <input type="radio" name="after_insert" value="back" checked="checked" tabindex="<?php echo $fields_cnt+4; ?>" /><?php echo $strAfterInsertBack; ?><br />
+            <input type="radio" name="after_insert" value="back" id="radio_after_insert_back" checked="checked" tabindex="<?php echo $fields_cnt+4; ?>" /><label for="radio_after_insert_back"><?php echo $strAfterInsertBack; ?></label><br />
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strOr; ?><br />
-            <input type="radio" name="after_insert" value="new_insert"<?php echo $checked; ?> tabindex="<?php echo $fields_cnt+5; ?>" /><?php echo $strAfterInsertNewInsert . "\n"; ?>
+            <input type="radio" name="after_insert" value="new_insert" id="radio_after_insert_new_insert"<?php echo $checked; ?> tabindex="<?php echo $fields_cnt+5; ?>" /><label for="radio_after_insert_new_insert"><?php echo $strAfterInsertNewInsert; ?></label>
         </td>
     </tr>
 
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 2c6712168..a1dd832d5 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -296,9 +296,9 @@ while ($row = mysql_fetch_array($fields_rs)) {
     ?>
 <tr>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-        <input type="checkbox" name="selected_fld[]" value="<?php echo urlencode($row['Field']); ?>" />
+        <input type="checkbox" name="selected_fld[]" value="<?php echo urlencode($row['Field']); ?>" id="checkbox_row_<?php echo urlencode($row['Field']); ?>" />
     </td>
-    <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">&nbsp;<?php echo $field_name; ?>&nbsp;</td>
+    <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">&nbsp;<label for="checkbox_row_<?php echo urlencode($row['Field']); ?>"><?php echo $field_name; ?></label>&nbsp;</td>
     <td bgcolor="<?php echo $bgcolor; ?>"<?php echo $type_nowrap; ?>><?php echo $type; ?><bdo dir="ltr"></bdo></td>
     <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $strAttribute; ?></td>
     <td bgcolor="<?php echo $bgcolor; ?>"><?php echo (($row['Null'] == '') ? $strNo : $strYes); ?>&nbsp;</td>
@@ -719,8 +719,8 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get'))
     onfocus="if (typeof(document.layers) == 'undefined' || typeof(textarea_selected) == 'undefined') {textarea_selected = 1; this.form.elements['sql_query'].select();}">
 <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE 1'); ?>
 </textarea><br />
-            <input type="checkbox" name="show_query" value="y" checked="checked" />&nbsp;
-                <?php echo $strShowThisQuery; ?><br />
+            <input type="checkbox" name="show_query" value="y" id="checkbox_show_query" checked="checked" />&nbsp;
+                <label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label><br />
             </div>
 <?php
 // loic1: displays import dump feature only if file upload available
@@ -750,9 +750,9 @@ if ($cfgBookmark['db'] && $cfgBookmark['table']) {
             echo '                <option value="' . $value . '">' . htmlentities($key) . '</option>' . "\n";
         }
         echo '            </select>' . "\n";
-        echo '            <input type="radio" name="action_bookmark" value="0" checked="checked" style="vertical-align: middle" />' . $strSubmit . "\n";
-        echo '            &nbsp;<input type="radio" name="action_bookmark" value="1" style="vertical-align: middle" />' . $strBookmarkView . "\n";
-        echo '            &nbsp;<input type="radio" name="action_bookmark" value="2" style="vertical-align: middle" />' . $strDelete . "\n";
+        echo '            <input type="radio" name="action_bookmark" value="0" id="radio_bookmark0" checked="checked" style="vertical-align: middle" /><label for="radio_bookmark0">' . $strSubmit . '</label>' . "\n";
+        echo '            &nbsp;<input type="radio" name="action_bookmark" value="1" id="radio_bookmark1" style="vertical-align: middle" /><label for="radio_bookmark1">' . $strBookmarkView . '</label>' . "\n";
+        echo '            &nbsp;<input type="radio" name="action_bookmark" value="2" id="radio_bookmark2" style="vertical-align: middle" /><label for="radio_bookmark2">' . $strDelete . '</label>' . "\n";
         echo '            <br />' . "\n";
         echo '            </div>' . "\n";
     }
@@ -837,16 +837,16 @@ echo "\n";
             <table cellpadding="5" border="2">
             <tr>
                 <td nowrap="nowrap">
-                    <input type="radio" name="what" value="structure" checked="checked" />
-                    <?php echo $strStrucOnly; ?>&nbsp;&nbsp;<br />
-                    <input type="radio" name="what" value="data" />
-                    <?php echo $strStrucData; ?>&nbsp;&nbsp;<br />
-                    <input type="radio" name="what" value="dataonly" />
-                    <?php echo $strDataOnly; ?>&nbsp;&nbsp;<br />
-                    <input type="radio" name="what" value="excel" />
-                    <?php echo $strStrucExcelCSV; ?>&nbsp;&nbsp;<br />
-                    <input type="radio" name="what" value="csv" />
-                    <?php echo $strStrucCSV;?>&nbsp;:<br />
+                    <input type="radio" name="what" value="structure" id="radio_dump_structure" checked="checked" />
+                    <label for="radio_dump_structure"><?php echo $strStrucOnly; ?></label>&nbsp;&nbsp;<br />
+                    <input type="radio" name="what" value="data" id="radio_dump_data" />
+                    <label for="radio_dump_data"><?php echo $strStrucData; ?></label>&nbsp;&nbsp;<br />
+                    <input type="radio" name="what" value="dataonly" id="radio_dump_dataonly" />
+                    <label for="radio_dump_dataonly"><?php echo $strDataOnly; ?></label>&nbsp;&nbsp;<br />
+                    <input type="radio" name="what" value="excel" id="radio_dump_excel" />
+                    <label for="radio_dump_excel"><?php echo $strStrucExcelCSV; ?></label>&nbsp;&nbsp;<br />
+                    <input type="radio" name="what" value="csv" id="radio_dump_csv" />
+                    <label for="radio_dump_csv"><?php echo $strStrucCSV;?></label>&nbsp;:<br />
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFieldsTerminatedBy; ?>&nbsp;
                     <input type="text" name="separator" size="2" value=";" class="textfield" />&nbsp;&nbsp;<br />
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFieldsEnclosedBy; ?>&nbsp;
@@ -857,25 +857,25 @@ echo "\n";
                     <input type="text" name="add_character" size="2" value="<?php echo ((PMA_whichCrlf() == "\n") ? '\n' : '\r\n'); ?>" class="textfield" />&nbsp;&nbsp;
                 </td>
                 <td valign="middle">
-                    <input type="checkbox" name="drop" value="1" />
-                    <?php echo $strStrucDrop; ?><br />
-                    <input type="checkbox" name="showcolumns" value="yes" />
-                    <?php echo $strCompleteInserts; ?><br />
-                    <input type="checkbox" name="extended_ins" value="yes" />
-                    <?php echo $strExtendedInserts; ?><br />
+                    <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" />
+                    <label for="checkbox_dump_drop"><?php echo $strStrucDrop; ?></label><br />
+                    <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" />
+                    <label for="checkbox_dump_showcolumns"><?php echo $strCompleteInserts; ?></label><br />
+                    <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" />
+                    <label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br />
 <?php
 // Add backquotes checkbox
 if (PMA_MYSQL_INT_VERSION >= 32306) {
     ?>
-                    <input type="checkbox" name="use_backquotes" value="1" />
-                    <?php echo $strUseBackquotes; ?><br />
+                    <input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" />
+                    <label for="checkbox_dump_use_backquotes"><?php echo $strUseBackquotes; ?></label><br />
     <?php
 } // end backquotes feature
 echo "\n";
 ?>
                     <br />
-                    <input type="checkbox" name="asfile" value="sendit" onclick="return checkTransmitDump(this.form, 'transmit')" />
-                    <?php echo $strSend . "\n"; ?>
+                    <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" onclick="return checkTransmitDump(this.form, 'transmit')" />
+                    <label for="checkbox_dump_asfile"><?php echo $strSend; ?></label>
 <?php
 // zip, gzip and bzip2 encode features
 if (PMA_PHP_INT_VERSION >= 40004) {
@@ -886,19 +886,22 @@ if (PMA_PHP_INT_VERSION >= 40004) {
         echo "\n" . '                    (' . "\n";
         if ($is_zip) {
             ?>
-                    <input type="checkbox" name="zip" value="zip" onclick="return checkTransmitDump(this.form, 'zip')" /><?php echo $strZip . (($is_gzip || $is_bzip) ? '&nbsp;' : '') . "\n"; ?>
+                    <input type="checkbox" name="zip" value="zip" id="checkbox_dump_zip" onclick="return checkTransmitDump(this.form, 'zip')" />
+                    <?php echo '<label for="checkbox_dump_zip">' . $strZip . '</label>' . (($is_gzip || $is_bzip) ? '&nbsp;' : '') . "\n"; ?>
             <?php
         }
         if ($is_gzip) {
             echo "\n"
             ?>
-                    <input type="checkbox" name="gzip" value="gzip" onclick="return checkTransmitDump(this.form, 'gzip')" /><?php echo $strGzip . (($is_bzip) ? '&nbsp;' : '') . "\n"; ?>
+                    <input type="checkbox" name="gzip" value="gzip" id="checkbox_dump_gzip" onclick="return checkTransmitDump(this.form, 'gzip')" />
+                    <?php echo '<label for="checkbox_dump_gzip">' . $strGzip . '</label>' . (($is_bzip) ? '&nbsp;' : '') . "\n"; ?>
             <?php
         }
         if ($is_bzip) {
             echo "\n"
             ?>
-                    <input type="checkbox" name="bzip" value="bzip" onclick="return checkTransmitDump(this.form, 'bzip')" /><?php echo $strBzip . "\n"; ?>
+                    <input type="checkbox" name="bzip" value="bzip" id="checkbox_dump_bzip" onclick="return checkTransmitDump(this.form, 'bzip')" />
+                    <?php echo '<label for="checkbox_dump_bzip">' . $strBzip . '</label>' . "\n"; ?>
             <?php
         }
         echo "\n" . '                    )';
@@ -1030,10 +1033,10 @@ for ($i = 0; $i < $num_dbs; $i++) {
                 </tr>
                 <tr>
                     <td nowrap="nowrap">
-                        <input type="radio" name="what" value="structure" checked="checked" />
-                        <?php echo $strStrucOnly; ?>&nbsp;&nbsp;<br />
-                        <input type="radio" name="what" value="data" />
-                        <?php echo $strStrucData; ?>&nbsp;&nbsp;
+                        <input type="radio" name="what" value="structure" id="radio_copy_structure" checked="checked" />
+                        <label for="radio_copy_structure"><?php echo $strStrucOnly; ?></label>&nbsp;&nbsp;<br />
+                        <input type="radio" name="what" value="data" id="radio_copy_data" />
+                        <label for="radio_copy_data"><?php echo $strStrucData; ?></label>&nbsp;&nbsp;
                     </td>
                     <td align="<?php echo $cell_align_right; ?>" valign="top">
                         <input type="submit" name="submit_copy" value="<?php echo $strGo; ?>" />
diff --git a/user_details.php3 b/user_details.php3
index 30c7cb221..5b79c1272 100644
--- a/user_details.php3
+++ b/user_details.php3
@@ -280,9 +280,9 @@ function PMA_tablePrivileges($form, $row = FALSE)
             echo '                <td>&nbsp;</td>' . "\n";
         }
         echo '                <td>' . "\n";
-        echo '                    <input type="checkbox" name="' . $priv . '_priv"' . $checked . ' />' . "\n";
+        echo '                    <input type="checkbox" name="' . $priv . '_priv" id="checkbox_priv_' . $priv . '"' . $checked . ' />' . "\n";
         echo '                </td>' . "\n";
-        echo '                <td>' . $priv . '</td>' . "\n";
+        echo '                <td><label for="checkbox_priv_' . $priv . '">' . $priv . '</label></td>' . "\n";
         if ($item % 2 == 0) {
             echo '            </tr>' . "\n";
         }
@@ -374,13 +374,13 @@ function PMA_normalOperations()
             <table>
             <tr>
                 <td>
-                    <input type="radio" name="anyhost" checked="checked" />
-                    <?php echo $GLOBALS['strAnyHost'] . "\n"; ?>
+                    <input type="radio" name="anyhost" id="radio_anyhost0" checked="checked" />
+                    <label for="radio_anyhost0"><?php echo $GLOBALS['strAnyHost']; ?></label>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="radio" name="anyhost" />
-                    <?php echo $GLOBALS['strHost']; ?>&nbsp;:&nbsp;
+                    <input type="radio" name="anyhost" id="radio_anyhost1" />
+                    <label for="radio_anyhost1"><?php echo $GLOBALS['strHost']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <input type="text" name="host" size="10" class="textfield" <?php echo $GLOBALS['chg_evt_handler']; ?>="this.form.anyhost[1].checked = true" />
@@ -388,13 +388,13 @@ function PMA_normalOperations()
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="anyuser" />
-                    <?php echo $GLOBALS['strAnyUser']; ?>
+                    <input type="radio" name="anyuser" id="radio_anyuser0" />
+                    <label for="radio_anyuser0"><?php echo $GLOBALS['strAnyUser']; ?></label>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="radio" name="anyuser" checked="checked" />
-                    <?php echo $GLOBALS['strUserName']; ?>&nbsp;:&nbsp;
+                    <input type="radio" name="anyuser" id="radio_anyuser1" checked="checked" />
+                    <label for="radio_anyuser1"><?php echo $GLOBALS['strUserName']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <input type="text" name="pma_user" size="10" class="textfield" <?php echo $GLOBALS['chg_evt_handler']; ?>="this.form.anyuser[1].checked = true" />
@@ -402,13 +402,13 @@ function PMA_normalOperations()
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="nopass" value="1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
-                    <?php echo $GLOBALS['strNoPassword'] . "\n"; ?>
+                    <input type="radio" name="nopass" value="1" id="radio_nopass1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
+                    <label for="radio_nopass1"><?php echo $GLOBALS['strNoPassword']; ?></label>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="radio" name="nopass" value="0" checked="checked" />
-                    <?php echo $GLOBALS['strPassword']; ?>&nbsp;:&nbsp;
+                    <input type="radio" name="nopass" value="0" id="radio_nopass0" checked="checked" />
+                    <label for="radio_nopass0"><?php echo $GLOBALS['strPassword']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <input type="password" name="pma_pw" size="10" class="textfield" <?php echo $GLOBALS['chg_evt_handler']; ?>="nopass[1].checked = true" />
@@ -486,13 +486,13 @@ function PMA_grantOperations($grants)
             <table>
             <tr>
                 <td>
-                    <input type="radio" name="anydb" value="1"<?php echo ($dbgrant) ? '' : ' checked="checked"'; ?> />
-                    <?php echo $GLOBALS['strAnyDatabase'] . "\n"; ?>
+                    <input type="radio" name="anydb" value="1" id="radio_anydb1"<?php echo ($dbgrant) ? '' : ' checked="checked"'; ?> />
+                    <label for="radio_anydb1"><?php echo $GLOBALS['strAnyDatabase']; ?></label>
                 </td>
                 <td>&nbsp;&nbsp;&nbsp;</td>
                 <td>
-                    <input type="radio" name="anydb" value="0"<?php echo ($dbgrant) ? ' checked="checked"' : ''; ?> />
-                    <?php echo $GLOBALS['strDatabase']; ?>&nbsp;:&nbsp;
+                    <input type="radio" name="anydb" value="0" id="radio_anydb0"<?php echo ($dbgrant) ? ' checked="checked"' : ''; ?> />
+                    <label for="radio_anydb0"><?php echo $GLOBALS['strDatabase']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <select name="dbgrant" onchange="change(this)">
@@ -525,13 +525,13 @@ function PMA_grantOperations($grants)
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="anytable" value="1"<?php echo ($tablegrant) ? '' : ' checked="checked"'; ?> />
-                    <?php echo $GLOBALS['strAnyTable'] . "\n"; ?>
+                    <input type="radio" name="anytable" value="1" id="radio_anytable1"<?php echo ($tablegrant) ? '' : ' checked="checked"'; ?> />
+                    <label for="radio_anytable1"><?php echo $GLOBALS['strAnyTable']; ?></label>
                 </td>
                 <td>&nbsp;&nbsp;&nbsp;</td>
                 <td>
-                    <input type="radio" name="anytable" value="0"<?php echo ($tablegrant) ? ' checked="checked"' : ''; ?> />
-                    <?php echo $GLOBALS['strTable']; ?>&nbsp;:&nbsp;
+                    <input type="radio" name="anytable" value="0" id="radio_anytable0"<?php echo ($tablegrant) ? ' checked="checked"' : ''; ?> />
+                    <label for="radio_anytable0"><?php echo $GLOBALS['strTable']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <select name="tablegrant" onchange="change(this)">
@@ -562,13 +562,13 @@ function PMA_grantOperations($grants)
             </tr>
             <tr>
                 <td valign="top">
-                    <input type="radio" name="anycolumn" value="1" checked="checked" />
-                    <?php echo $GLOBALS['strAnyColumn'] . "\n"; ?>
+                    <input type="radio" name="anycolumn" value="1" id="radio_anycolumn1" checked="checked" />
+                    <label for="radio_anycolumn1"><?php echo $GLOBALS['strAnyColumn']; ?></label>
                 </td>
                 <td>&nbsp;&nbsp;&nbsp;</td>
                 <td valign="top">
-                    <input type="radio" name="anycolumn" value="0" />
-                    <?php echo $GLOBALS['strColumn']; ?>&nbsp;:&nbsp;
+                    <input type="radio" name="anycolumn" value="0" id="radio_anycolumn0" />
+                    <label for="radio_anycolumn0"><?php echo $GLOBALS['strColumn']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
     <?php
@@ -679,13 +679,13 @@ function PMA_editOperations($host, $user)
             <table>
             <tr>
                 <td>
-                    <input type="radio" value="1" name="anyhost"<?php if ($host == '' || $host == '%') echo ' checked="checked"'; ?> />
-                    <?php echo $GLOBALS['strAnyHost'] . "\n"; ?>
+                    <input type="radio" value="1" name="anyhost" id="radio_anyhost1"<?php if ($host == '' || $host == '%') echo ' checked="checked"'; ?> />
+                    <label for="radio_anyhost1"><?php echo $GLOBALS['strAnyHost']; ?></label>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="radio" value="0" name="anyhost"<?php if ($host != '' && $host != '%') echo ' checked="checked"'; ?> />
-                    <?php echo $GLOBALS['strHost']; ?>&nbsp;:&nbsp;
+                    <input type="radio" value="0" name="anyhost" id="radio_anyhost0"<?php if ($host != '' && $host != '%') echo ' checked="checked"'; ?> />
+                    <label for="radio_anyhost0"><?php echo $GLOBALS['strHost']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <input type="text" name="new_server" size="10" value="<?php echo str_replace('"', '&quot;', $host); ?>" class="textfield" <?php echo $GLOBALS['chg_evt_handler']; ?>="this.form.anyhost[1].checked = true" />
@@ -693,13 +693,13 @@ function PMA_editOperations($host, $user)
             </tr>
             <tr>
                 <td>
-                    <input type="radio" value="1" name="anyuser"<?php if ($user == '' || $user == '%') echo ' checked="checked"'; ?> />
-                    <?php echo $GLOBALS['strAnyUser']; ?>
+                    <input type="radio" value="1" name="anyuser" id="radio_anyuser1"<?php if ($user == '' || $user == '%') echo ' checked="checked"'; ?> />
+                    <label for="radio_anyuser1"><?php echo $GLOBALS['strAnyUser']; ?></label>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="radio" value="0" name="anyuser" checked="checked"<?php if ($user != '' && $user != '%') echo ' checked="checked"'; ?> />
-                    <?php echo $GLOBALS['strUserName']; ?>&nbsp;:&nbsp;
+                    <input type="radio" value="0" name="anyuser" id="radio_anyuser0" checked="checked"<?php if ($user != '' && $user != '%') echo ' checked="checked"'; ?> />
+                    <label for="radio_anyuser0"><?php echo $GLOBALS['strUserName']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <input type="text" name="new_user" size="10" value="<?php echo str_replace('"', '&quot;', $user); ?>" class="textfield" <?php echo $GLOBALS['chg_evt_handler']; ?>="this.form.anyuser[1].checked = true" />
@@ -707,8 +707,8 @@ function PMA_editOperations($host, $user)
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="nopass" value="-1" checked="checked" onclick="new_pw.value = ''; new_pw2.value = ''; this.checked = true" />
-                    <?php echo $GLOBALS['strKeepPass'] . "\n"; ?>
+                    <input type="radio" name="nopass" value="-1" id="radio_nopass-1" checked="checked" onclick="new_pw.value = ''; new_pw2.value = ''; this.checked = true" />
+                    <label for="radio_nopass-1"><?php echo $GLOBALS['strKeepPass']; ?></label>
                 </td>
                 <td colspan="3">&nbsp;</td>
             </tr>
@@ -717,13 +717,13 @@ function PMA_editOperations($host, $user)
             </tr>
             <tr>
                 <td>
-                    <input type="radio" name="nopass" value="1" onclick="new_pw.value = ''; new_pw2.value = ''; this.checked = true" />
-                    <?php echo $GLOBALS['strNoPassword'] . "\n"; ?>
+                    <input type="radio" name="nopass" value="1" id="radio_nopass1" onclick="new_pw.value = ''; new_pw2.value = ''; this.checked = true" />
+                    <label for="radio_nopass1"><?php echo $GLOBALS['strNoPassword']; ?></label>
                 </td>
                 <td>&nbsp;</td>
                 <td>
-                    <input type="radio" name="nopass" value="0" />
-                    <?php echo $GLOBALS['strPassword']; ?>&nbsp;:&nbsp;
+                    <input type="radio" name="nopass" value="0" id="radio_nopass0" />
+                    <label for="radio_nopass0"><?php echo $GLOBALS['strPassword']; ?></label>&nbsp;:&nbsp;
                 </td>
                 <td>
                     <input type="password" name="new_pw" size="10" <?php echo $GLOBALS['chg_evt_handler']; ?>="nopass[2].checked = true" />