diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss
index 459e907d..7ce1c714 100644
--- a/styles/elements/_inputs.scss
+++ b/styles/elements/_inputs.scss
@@ -65,20 +65,12 @@
   }
 
   label {
-    padding: 0 0 $gap 0;
+    padding: 0;
     margin: 0;
     @include h4;
     @include line-max;
     position: relative;
 
-    .usa-input__help {
-      display: block;
-      @include h5;
-      font-weight: normal;
-      padding-top: $gap / 2;
-      @include line-max;
-    }
-
     .icon {
       position: absolute;
       left: 100%;
@@ -88,6 +80,14 @@
     }
   }
 
+  .usa-input__help {
+    display: block;
+    @include h4;
+    font-weight: normal;
+    padding: $gap/2 0;
+    @include line-max;
+  }
+
   input,
   textarea,
   select {
@@ -103,6 +103,10 @@
       .icon {
         vertical-align: middle;
       }
+
+  .usa-input__help {
+    font-weight: $font-bold;
+  }
     }
 
     ul {
diff --git a/templates/components/text_input.html b/templates/components/text_input.html
index 0f50ca89..8145c366 100644
--- a/templates/components/text_input.html
+++ b/templates/components/text_input.html
@@ -1,6 +1,5 @@
 {% macro TextInput(field, placeholder='') -%}
   <div class='usa-input {% if errors %}usa-input--error{% endif %}'>
-    <label for={{field.name}}>
       {{ field.label }}
 
       {% if field.description %}
@@ -10,7 +9,6 @@
       {% if errors %}
         {{ Icon('alert') }}
       {% endif %}
-    </label>
 
     {{ field(placeholder=placeholder) | safe }}