diff --git a/js/mixins/form.js b/js/mixins/form.js
index 7ba7629d..e5f2ddbe 100644
--- a/js/mixins/form.js
+++ b/js/mixins/form.js
@@ -5,6 +5,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    enableSave: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   mounted: function() {
@@ -52,9 +56,9 @@ export default {
     canSave: function() {
       const formValid = !this.invalid
 
-      if (formValid) {
+      if (this.changed && formValid) {
         return true
-      } else if (this.changed && formValid) {
+      } else if (this.enableSave && formValid) {
         return true
       } else {
         return false
diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html
index 0c16247a..a00b99c0 100644
--- a/templates/applications/fragments/members.html
+++ b/templates/applications/fragments/members.html
@@ -57,12 +57,12 @@
               <h1>Verify Member Information</h1>
               <hr>
             </div>
-            <base-form inline-template>
+            <base-form inline-template :enable-save="true">
               <form id='{{ resend_invite_modal }}' method="POST" action="{{ url_for('applications.resend_invite', application_id=application.id, application_role_id=member.role_id) }}">
                 {{ member.update_invite_form.csrf_token }}
                 {{ member_fields.InfoFields(member.update_invite_form) }}
                 <div class="action-group">
-                {{ SaveButton(text="Resend Invite", disable_on_initial_render=False)}}
+                {{ SaveButton(text="Resend Invite")}}
                   <a class='action-group__action' v-on:click="closeModal('{{ resend_invite_modal }}')">{{ "common.cancel" | translate }}</a>
                 </div>
               </form>
diff --git a/templates/applications/fragments/new_member_modal_content.html b/templates/applications/fragments/new_member_modal_content.html
index f4bf5bb3..d59585f0 100644
--- a/templates/applications/fragments/new_member_modal_content.html
+++ b/templates/applications/fragments/new_member_modal_content.html
@@ -25,7 +25,7 @@
     <input
         type='button'
         v-on:click="next()"
-        v-bind:disabled="invalid"
+        v-bind:disabled="!canSave"
         class='action-group__action usa-button'
         value='{{ "portfolios.applications.members.form.next_button" | translate }}'>
   {% endset %}
@@ -40,6 +40,7 @@
       type="submit"
       class='action-group__action usa-button'
       form="add-app-mem"
+      v-bind:disabled="!canSave"
       value='{{ "portfolios.applications.members.form.add_member" | translate}}'>
   {% endset %}
 
diff --git a/templates/components/save_button.html b/templates/components/save_button.html
index 70bf54ce..5426219f 100644
--- a/templates/components/save_button.html
+++ b/templates/components/save_button.html
@@ -1,12 +1,11 @@
-{% macro SaveButton(text="common.save" | translate, element="button", additional_classes="", form=None, disable_on_initial_render=True) -%}
-  {% set class = "usa-button usa-button-primary" + additional_classes %}
-  {% set disabled = "!changed || invalid" if disable_on_initial_render else "invalid"%}
+{% macro SaveButton(text="common.save" | translate, element="button", additional_classes="", form=None) -%}
+  {% set class = "usa-button usa-button-primary " + additional_classes %}
 
   {% if element == "button" %}
-    <button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled='{{ disabled }}' {{ form_attr }} >
+    <button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!canSave" {{ form_attr }} >
       {{ text }}
     </button>
   {% elif element == 'input' %}
-    <input type="submit" class="{{ class }}" tabindex="0" v-bind:disabled='{{ disabled }}' value='{{ text }}' {% if form %}form="{{ form }}"{% endif %} />
+    <input type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!canSave" value='{{ text }}' {% if form %}form="{{ form }}"{% endif %} />
   {% endif %}
 {%- endmacro %}