diff --git a/system/templates/actors/npc/stance.html b/system/templates/actors/npc/stance.html
index efc79f3..0f606e7 100644
--- a/system/templates/actors/npc/stance.html
+++ b/system/templates/actors/npc/stance.html
@@ -1,5 +1,5 @@
 <li class="stance-content">
-    <label for="stance_{{ringId}}" class="stance-title {{ringId}}">
+    <label class="stance-title {{ringId}}">
         {{ localizeRing ringId }}
         <input id="stance_{{ringId}}" type="radio" name="data.stance" value="{{ringId}}" {{radioChecked ringId stance}}/>
     </label>
diff --git a/system/templates/dice/dice-picker-dialog.html b/system/templates/dice/dice-picker-dialog.html
index 87026d9..d74fbc2 100644
--- a/system/templates/dice/dice-picker-dialog.html
+++ b/system/templates/dice/dice-picker-dialog.html
@@ -141,15 +141,15 @@
         <!-- Fourth line -->
         <tr>
             <td>
-                <input type="checkbox" id="diff_hidden" name="diff_hidden" value="1">
-                <label for="diff_hidden">
+                <label>
+                    <input type="checkbox" id="diff_hidden" name="diff_hidden" value="1">
                     {{localize 'l5r5e.dicepicker.difficulty_hidden_label'}}
                 </label>
             </td>
             <td>
                 {{#if canUseVoidPoint}}
-                    <input type="checkbox" id="use_void_point" name="use_void_point" value="1">
-                    <label for="use_void_point">
+                    <label>
+                        <input type="checkbox" id="use_void_point" name="use_void_point" value="1">
                         {{localize 'l5r5e.dicepicker.use_void_point_label'}}
                     </label>
                 {{/if}}