diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html
index 1e41e32c..0c16247a 100644
--- a/templates/applications/fragments/members.html
+++ b/templates/applications/fragments/members.html
@@ -62,7 +62,7 @@
{{ member.update_invite_form.csrf_token }}
{{ member_fields.InfoFields(member.update_invite_form) }}
diff --git a/templates/components/save_button.html b/templates/components/save_button.html
index 919cc73b..0e47cb6e 100644
--- a/templates/components/save_button.html
+++ b/templates/components/save_button.html
@@ -1,10 +1,12 @@
-{% macro SaveButton(text, element="button", additional_classes="", form=None) -%}
+{% macro SaveButton(text, 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"%}
+
{% if element == "button" %}
-