diff --git a/atst/models/application_role.py b/atst/models/application_role.py
index 12c7a9c3..f8f7f201 100644
--- a/atst/models/application_role.py
+++ b/atst/models/application_role.py
@@ -113,19 +113,17 @@ class ApplicationRole(
     @property
     def display_status(self):
         if (
-            self.is_pending
-            and self.latest_invitation
-            and self.latest_invitation.is_pending
-        ):
-            return "invite_pending"
-
-        elif (
             self.is_pending
             and self.latest_invitation
             and self.latest_invitation.is_expired
         ):
             return "invite_expired"
-
+        elif (
+            self.is_pending
+            and self.latest_invitation
+            and self.latest_invitation.is_pending
+        ):
+            return "invite_pending"
         elif self.is_active and any(
             env_role.is_pending for env_role in self.environment_roles
         ):
diff --git a/js/components/multi_checkbox_input.js b/js/components/multi_checkbox_input.js
index 8ef4e880..fdba839f 100644
--- a/js/components/multi_checkbox_input.js
+++ b/js/components/multi_checkbox_input.js
@@ -14,6 +14,7 @@ export default {
       default: () => [],
     },
     initialOtherValue: String,
+    optional: Boolean,
   },
 
   data: function() {
@@ -45,7 +46,7 @@ export default {
 
   computed: {
     valid: function() {
-      return this.showValid
+      return this.optional || this.showValid
     },
   },
 }
diff --git a/js/components/options_input.js b/js/components/options_input.js
index 639c8454..fafd0e02 100644
--- a/js/components/options_input.js
+++ b/js/components/options_input.js
@@ -10,10 +10,6 @@ export default {
       default: () => [],
     },
     initialValue: String,
-    watch: {
-      type: Boolean,
-      default: false,
-    },
     optional: Boolean,
     nullOption: {
       type: String,
diff --git a/js/mixins/text_input_mixin.js b/js/mixins/text_input_mixin.js
index 54f8a7cf..87471a50 100644
--- a/js/mixins/text_input_mixin.js
+++ b/js/mixins/text_input_mixin.js
@@ -27,10 +27,6 @@ export default {
     paragraph: String,
     noMaxWidth: String,
     optional: Boolean,
-    watch: {
-      type: Boolean,
-      default: false,
-    },
   },
 
   data: function() {
diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html
index 97ab3832..20ecc210 100644
--- a/templates/applications/fragments/member_form_fields.html
+++ b/templates/applications/fragments/member_form_fields.html
@@ -66,8 +66,7 @@
           <optionsinput inline-template
             v-bind:initial-value="'{{ sub_form.role.data | string }}'"
             v-bind:name="'{{ sub_form.name | string }}{% if member_role_id %}-{{ member_role_id }}{% endif %}'"
-            v-bind:optional="true"
-            v-bind:watch="true">
+            v-bind:optional="true">
             <fieldset data-ally-disabled="true" v-on:change="onInput" class="usa-input__choices">
               {{ sub_form.role(**{"v-model": "value", "id": "{}-{}".format(sub_form.role.name, member_role_id)}) }}
             </fieldset>
diff --git a/templates/components/clin_dollar_amount.html b/templates/components/clin_dollar_amount.html
index dd8468dc..c39d3ef6 100644
--- a/templates/components/clin_dollar_amount.html
+++ b/templates/components/clin_dollar_amount.html
@@ -1,6 +1,6 @@
 {% from 'components/icon.html' import Icon %}
 
-{% macro CLINDollarAmount(type, field=None, funding_validation=False) -%} 
+{% macro CLINDollarAmount(type, field=None, funding_validation=False) -%}
  <div class="form-row">
     <div class="form-col">
       <clindollaramount
@@ -21,16 +21,15 @@
           :key="'clins-' + clinIndex + '-' + '{{ type }}' + '_amount'"
         {% endif  %}
 
-        validation="clinDollars"
-        :watch='true'>
+        validation="clinDollars">
         <div v-bind:class="['usa-input usa-input--validation--dollars', { 'usa-input--error': showFundingError, 'usa-input--success': showFundingValid}]">
           {% if field %}
-          <label for='{{ field.name }}'> 
+          <label for='{{ field.name }}'>
           {% else %}
           <label :for='name'>
           {% endif  %}
 
-            {% if type=="obligated" %} 
+            {% if type=="obligated" %}
             <div class="usa-input__title">{{ 'task_orders.form.obligated_funds_label' | translate }}</div>
             {% else %}
             <div class="usa-input__title">{{ 'task_orders.form.total_funds_label' | translate }}</div>
@@ -67,4 +66,4 @@
       </clindollaramount>
     </div>
   </div>
-  {%- endmacro %}
\ No newline at end of file
+  {%- endmacro %}
diff --git a/templates/components/clin_fields.html b/templates/components/clin_fields.html
index 94ca2a5b..6d79dc08 100644
--- a/templates/components/clin_fields.html
+++ b/templates/components/clin_fields.html
@@ -41,10 +41,9 @@
         <div class="form-row">
           <div class="form-col">
             {% if fields %}
-              {{ TextInput(fields.number, watch=True, optional=False) }}
+              {{ TextInput(fields.number, optional=False) }}
             {% else %}
-              <textinput :name="'clins-' + clinIndex + '-number'" :watch='true'
-              inline-template>
+              <textinput :name="'clins-' + clinIndex + '-number'" inline-template>
                 <div v-bind:class="['usa-input usa-input--validation--' + validation, { 'usa-input--error': showError, 'usa-input--success': showValid, 'usa-input--validation--paragraph': paragraph, 'no-max-width': noMaxWidth }]">
                   <label :for="name">
                     <span v-show='showError'>{{ Icon('alert',classes="icon-validation") }}</span>
@@ -82,9 +81,9 @@
         <div class="form-row">
           <div class="form-col">
             {% if fields %}
-              {{ OptionsInput(fields.jedi_clin_type, watch=True, show_validation=False, optional=False) }}
+              {{ OptionsInput(fields.jedi_clin_type, show_validation=False, optional=False) }}
             {% else %}
-              <optionsinput :name="'clins-' + clinIndex + '-jedi_clin_type'" :watch='true' :optional='false' inline-template>
+              <optionsinput :name="'clins-' + clinIndex + '-jedi_clin_type'" :optional='false' inline-template>
                 <div v-bind:class="['usa-input', { 'usa-input--error': showError, 'usa-input--success': showValid }]">
                   <fieldset data-ally-disabled="true" class="usa-input__choices" v-on:change="onInput">
                       <legend>
diff --git a/templates/components/multi_checkbox_input.html b/templates/components/multi_checkbox_input.html
index 40fb3d7a..2f2c65ec 100644
--- a/templates/components/multi_checkbox_input.html
+++ b/templates/components/multi_checkbox_input.html
@@ -11,6 +11,7 @@
     {% if other_input_field and other_input_field.data and other_input_field.data != "None" %}
       initial-other-value="{{ other_input_field.data }}"
     {% endif %}
+    v-bind:optional={{ optional|lower }}
     key='{{ field.name }}'>
     <div
       v-bind:class="['usa-input', { 'usa-input--error': showError, 'usa-input--success': showValid }]">
diff --git a/templates/components/options_input.html b/templates/components/options_input.html
index e346440d..f97487b3 100644
--- a/templates/components/options_input.html
+++ b/templates/components/options_input.html
@@ -8,7 +8,6 @@
   label=True,
   show_validation=True,
   disabled=False,
-  watch=False,
   optional=True) -%}
   <optionsinput
     name='{{ field.name }}'
@@ -16,7 +15,6 @@
     {% if field.errors %}v-bind:initial-errors='{{ field.errors | list }}'{% endif %}
     {% if field.data and field.data != "None" %}v-bind:initial-value="'{{ field.data }}'"{% endif %}
     key='{{ field.name }}'
-    v-bind:watch='{{ watch | string | lower }}'
     v-bind:optional={{ optional|lower }}
     v-bind:null-option="'{{ field.default }}'"
     >
diff --git a/templates/components/text_input.html b/templates/components/text_input.html
index 69ebd727..d800d63b 100644
--- a/templates/components/text_input.html
+++ b/templates/components/text_input.html
@@ -17,7 +17,6 @@
   optional=True,
   showOptional=True,
   showLabel=True,
-  watch=False,
   show_validation=True) -%}
 
   <textinput
@@ -30,7 +29,6 @@
     {% if field.errors %}v-bind:initial-errors='{{ field.errors | list }}'{% endif %}
     v-bind:optional={{ optional|lower }}
     key='{{ field.name }}'
-    :watch='{{ watch | string | lower }}'
     inline-template>
 
     <div