diff --git a/templates/components/options_input.html b/templates/components/options_input.html
index ff0d8814..06f4c3db 100644
--- a/templates/components/options_input.html
+++ b/templates/components/options_input.html
@@ -1,7 +1,7 @@
 {% from "components/icon.html" import Icon %}
 
 {% macro OptionsInput(field, inline=False) -%}
-  <div class='usa-input {% if errors %}usa-input--error{% endif %}'>
+  <div class='usa-input {% if field.errors %}usa-input--error{% endif %}'>
 
     <fieldset class="usa-input__choices {% if inline %}usa-input__choices--inline{% endif %}">
       <legend>
diff --git a/templates/components/text_input.html b/templates/components/text_input.html
index 8145c366..0f50ca89 100644
--- a/templates/components/text_input.html
+++ b/templates/components/text_input.html
@@ -1,5 +1,6 @@
 {% macro TextInput(field, placeholder='') -%}
   <div class='usa-input {% if errors %}usa-input--error{% endif %}'>
+    <label for={{field.name}}>
       {{ field.label }}
 
       {% if field.description %}
@@ -9,6 +10,7 @@
       {% if errors %}
         {{ Icon('alert') }}
       {% endif %}
+    </label>
 
     {{ field(placeholder=placeholder) | safe }}