Index: /branches/release-36/tmpl/cms/cfg_comments.tmpl
===================================================================
--- /branches/release-36/tmpl/cms/cfg_comments.tmpl (revision 1212)
+++ /branches/release-36/tmpl/cms/cfg_comments.tmpl (revision 2076)
@@ -90,5 +90,5 @@
         help_page="blog_settings_feedback"
         help_section="accept_comments_from">
-        <input type="checkbox" name="allow_comments" value="1" id="allow_comments" onclick="toggleHidden('commenting-policy'); toggleHidden('commenting-display-options'); return true"<mt:if name="allow_comments"> checked="checked"</mt:if> class="cb" /> <__trans phrase="If enabled, comments will be accepted.">
+        <input type="checkbox" name="allow_comments" value="1" id="allow_comments" onclick="toggleHidden('commenting-policy'); toggleHidden('commenting-display-options'); return true"<mt:if name="allow_comments"> checked="checked"</mt:if> class="cb" /> <label for="allow_comments"><__trans phrase="If enabled, comments will be accepted."></label>
     </mtapp:setting>
 
@@ -120,5 +120,5 @@
         help_page="blog_settings_feedback"
         help_section="allow_html">
-<input type="checkbox" name="allow_comment_html" id="allow_comment_html" onclick="toggleSubPrefs(this);" value="1"<mt:if name="allow_comment_html"> checked="checked"</mt:if> class="cb" /> <__trans phrase="If enabled, users will be able to enter a limited set of HTML in their comments. If not, all HTML will be stripped out.">
+<input type="checkbox" name="allow_comment_html" id="allow_comment_html" onclick="toggleSubPrefs(this);" value="1"<mt:if name="allow_comment_html"> checked="checked"</mt:if> class="cb" /> <label for="allow_comment_html"><__trans phrase="If enabled, users will be able to enter a limited set of HTML in their comments. If not, all HTML will be stripped out."></label>
     </mtapp:setting>
 
@@ -200,5 +200,5 @@
         help_page="blog_settings_feedback"
         help_section="autolink_urls">
-<input type="checkbox" value="1" name="autolink_urls" id="autolink_urls"<mt:if name="autolink_urls"> checked="checked"</mt:if> class="cb" /> <__trans phrase="If enabled, all non-linked URLs will be transformed into links to that URL."> 
+<input type="checkbox" value="1" name="autolink_urls" id="autolink_urls"<mt:if name="autolink_urls"> checked="checked"</mt:if> class="cb" /> <label for="autolink_urls"><__trans phrase="If enabled, all non-linked URLs will be transformed into links to that URL."></label>
     </mtapp:setting>
 
@@ -217,8 +217,8 @@
 
     <mtapp:setting
-        id="capthca_provider"
+        id="captcha_provider"
         label="<__trans phrase="CAPTCHA Provider">">
         <mt:if name="captcha_loop">
-            <select name="captcha_provider">
+            <select name="captcha_provider" id="captcha_provider">
             <option value="none"><__trans phrase="none"></option>
             <mt:loop name="captcha_loop">