diff --git a/rhodecode/templates/forms/checkbox.pt b/rhodecode/templates/forms/checkbox.pt
index 2e0520ee..a5252fb5 100644
--- a/rhodecode/templates/forms/checkbox.pt
+++ b/rhodecode/templates/forms/checkbox.pt
@@ -1,20 +1,26 @@
-<div class="checkbox">
-  <input tal:define="name name|field.name;
-                       true_val true_val|field.widget.true_val;
-                       css_class css_class|field.widget.css_class;
-                       style style|field.widget.style;
-                       oid oid|field.oid"
-           type="checkbox"
-           name="${name}" value="${true_val}"
-           id="${oid}"
-           tal:attributes="checked cstruct == true_val;
-                           class css_class;
-                           style style;" />
+<span tal:define="name name|field.name;
+                     true_val true_val|field.widget.true_val;
+                     css_class css_class|field.widget.css_class;
+                     style style|field.widget.style;
+                     oid oid|field.oid;
+                     help_block help_block|field.widget.help_block|'';
+                    "
+      tal:omit-tag="">
 
+<div class="checkbox">
+  <input type="checkbox" name="${name}" value="${true_val}"
+         id="${oid}"
+         tal:attributes="checked cstruct == true_val;
+                         class css_class;
+                         style style;"
+  />
+  <p tal:condition="help_block" class="help-block">${help_block}</p>
   <label for="${field.oid}">
     <span tal:condition="hasattr(field, 'schema') and hasattr(field.schema, 'label')"
           tal:replace="field.schema.label" class="checkbox-label" >
     </span>
 
   </label>
-</div>
\ No newline at end of file
+</div>
+
+</span>
\ No newline at end of file
diff --git a/rhodecode/templates/forms/textinput.pt b/rhodecode/templates/forms/textinput.pt
index 578c3a23..3b76d3e2 100644
--- a/rhodecode/templates/forms/textinput.pt
+++ b/rhodecode/templates/forms/textinput.pt
@@ -6,21 +6,25 @@
                   mask_placeholder mask_placeholder|field.widget.mask_placeholder;
                   style style|field.widget.style;
                   help_block help_block|field.widget.help_block|'';
-"
+                 "
       tal:omit-tag="">
-    <input type="text" name="${name}" value="${cstruct}"
-           tal:attributes="class string: form-control ${css_class or ''};
-                           style style"
-            placeholder="${placeholder}"
-           id="${oid}"/>
 
-    <p tal:condition="help_block" class="help-block">${help_block}</p>
-    <script tal:condition="mask" type="text/javascript">
-      deform.addCallback(
-         '${oid}',
-         function (oid) {
-            $("#" + oid).mask("${mask}",
-                 {placeholder:"${mask_placeholder}"});
-         });
-    </script>
+<input type="text" name="${name}" value="${cstruct}"
+       id="${oid}"
+       placeholder="${placeholder}"
+
+       tal:attributes="class string: form-control ${css_class or ''};
+                       style style"
+/>
+
+<p tal:condition="help_block" class="help-block">${help_block}</p>
+<script tal:condition="mask" type="text/javascript">
+  deform.addCallback(
+     '${oid}',
+     function (oid) {
+        $("#" + oid).mask("${mask}",
+             {placeholder:"${mask_placeholder}"});
+     });
+</script>
+
 </span>
\ No newline at end of file