diff --git a/.secrets.baseline b/.secrets.baseline
index a203d223..bc5bea51 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2019-09-30T16:06:53Z",
+  "generated_at": "2019-10-02T23:24:50Z",
   "plugins_used": [
     {
       "base64_limit": 4.5,
diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py
index 87b5dd7f..18b92603 100644
--- a/atst/routes/applications/settings.py
+++ b/atst/routes/applications/settings.py
@@ -96,6 +96,13 @@ def get_members_data(application):
         form = UpdateMemberForm(
             environment_roles=env_roles_form_data, **permission_sets
         )
+        update_invite_form = None
+
+        if member.latest_invitation and member.latest_invitation.can_resend:
+            update_invite_form = MemberForm(obj=member.latest_invitation)
+        else:
+            update_invite_form = MemberForm()
+
         members_data.append(
             {
                 "role_id": member.id,
@@ -104,6 +111,7 @@ def get_members_data(application):
                 "environment_roles": environment_roles,
                 "role_status": member.status.value,
                 "form": form,
+                "update_invite_form": update_invite_form,
             }
         )
 
diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html
new file mode 100644
index 00000000..96c6966b
--- /dev/null
+++ b/templates/applications/fragments/member_form_fields.html
@@ -0,0 +1,71 @@
+{% from "components/checkbox_input.html" import CheckboxInput %}
+{% from "components/text_input.html" import TextInput %}
+{% from "components/phone_input.html" import PhoneInput %}
+
+{% macro PermsFields(form, new=False, member_role_id=None) %}
+  <h4>{{ "portfolios.applications.members.form.project_perms" | translate }}</h4>
+  <div class="application-perms">
+    {% if new %}
+      {% set team_mgmt = form.perms_team_mgmt.name %}
+      {% set env_mgmt = form.perms_env_mgmt.name %}
+      {% set del_env = form.perms_del_env.name %}
+    {% else %}
+      {% set team_mgmt = "perms_team_mgmt-{}".format(member_role_id) %}
+      {% set env_mgmt = "perms_env_mgmt-{}".format(member_role_id) %}
+      {% set del_env = "perms_del_env-{}".format(member_role_id) %}
+    {% endif %}
+
+    {{ CheckboxInput(form.perms_team_mgmt, classes="input__inline-fields", key=team_mgmt, id=team_mgmt, optional=True) }}
+    {{ CheckboxInput(form.perms_env_mgmt, classes="input__inline-fields", key=env_mgmt, id=env_mgmt, optional=True) }}
+    {{ CheckboxInput(form.perms_del_env, classes="input__inline-fields", key=del_env, id=del_env, optional=True) }}
+  </div>
+  <div class="environment_roles environment-roles-new">
+    <h4>{{ "portfolios.applications.members.form.env_access" | translate }}</h4>
+    <hr>
+    {% for environment_data in form.environment_roles %}
+      <optionsinput inline-template
+        v-bind:initial-value="'{{ environment_data.role.data | string }}'"
+        v-bind:name="'{{ environment_data.name | string }}'"
+        v-bind:optional="true"
+        v-bind:watch="true">
+        <div class="usa-input">
+          <fieldset data-ally-disabled="true" v-on:change="onInput" class="usa-input__choices">
+            <div class="form-row">
+              <div class="form-col form-col--two-thirds">
+                <legend>
+                  <div v-bind:class='["usa-input__title-inline", {"environment-name--gray": value === "None" }]'>
+                    {{ environment_data.environment_name.data }}
+                  </div>
+                </legend>
+              </div>
+              <div class="form-col form-col--third">
+                {{ environment_data.role(**{"v-model": "value"}) }}
+              </div>
+            </div>
+          </fieldset>
+        </div>
+      </optionsinput>
+      {{ environment_data.environment_id() }}
+      <hr>
+    {% endfor %}
+  </div>
+{% endmacro %}
+
+{% macro InfoFields(member_form) %}
+  <div class='form-row'>
+    {{ TextInput(member_form.first_name, validation='requiredField', optional=False) }}
+  </div>
+  <div class='form-row'>
+    {{ TextInput(member_form.last_name, validation='requiredField', optional=False) }}
+  </div>
+  <div class='form-row'>
+    {{ TextInput(member_form.email, validation='email', optional=False) }}
+  </div>
+  <div class="form-row">
+    {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}}
+  </div>
+  <div class='form-row'>
+    {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }}
+  </div>
+  <a href="#">How do I find the DoD ID?</a>
+{% endmacro %}
diff --git a/templates/applications/fragments/member_perms_form_fields.html b/templates/applications/fragments/member_perms_form_fields.html
deleted file mode 100644
index c0261ed3..00000000
--- a/templates/applications/fragments/member_perms_form_fields.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% from "components/checkbox_input.html" import CheckboxInput %}
-
-{% macro MemberPermsFields(form, new=False, member_role_id=None) %}
-  <div class="form-content--app-mem">
-    <h4>{{ "portfolios.applications.members.form.project_perms" | translate }}</h4>
-    <div class="application-perms">
-      {% if new %}
-        {% set team_mgmt = form.perms_team_mgmt.name %}
-        {% set env_mgmt = form.perms_env_mgmt.name %}
-        {% set del_env = form.perms_del_env.name %}
-      {% else %}
-        {% set team_mgmt = "perms_team_mgmt-{}".format(member_role_id) %}
-        {% set env_mgmt = "perms_env_mgmt-{}".format(member_role_id) %}
-        {% set del_env = "perms_del_env-{}".format(member_role_id) %}
-      {% endif %}
-
-      {{ CheckboxInput(form.perms_team_mgmt, classes="input__inline-fields", key=team_mgmt, id=team_mgmt, optional=True) }}
-      {{ CheckboxInput(form.perms_env_mgmt, classes="input__inline-fields", key=env_mgmt, id=env_mgmt, optional=True) }}
-      {{ CheckboxInput(form.perms_del_env, classes="input__inline-fields", key=del_env, id=del_env, optional=True) }}
-    </div>
-    <div class="environment_roles environment-roles-new">
-      <h4>{{ "portfolios.applications.members.form.env_access" | translate }}</h4>
-      <hr>
-      {% for environment_data in form.environment_roles %}
-        <optionsinput inline-template
-          v-bind:initial-value="'{{ environment_data.role.data | string }}'"
-          v-bind:name="'{{ environment_data.name | string }}'"
-          v-bind:optional="true"
-          v-bind:watch="true">
-          <div class="usa-input">
-            <fieldset data-ally-disabled="true" v-on:change="onInput" class="usa-input__choices">
-              <div class="form-row">
-                <div class="form-col form-col--two-thirds">
-                  <legend>
-                    <div v-bind:class='["usa-input__title-inline", {"environment-name--gray": value === "None" }]'>
-                      {{ environment_data.environment_name.data }}
-                    </div>
-                  </legend>
-                </div>
-                <div class="form-col form-col--third">
-                  {{ environment_data.role(**{"v-model": "value"}) }}
-                </div>
-              </div>
-            </fieldset>
-          </div>
-        </optionsinput>
-        {{ environment_data.environment_id() }}
-        <hr>
-      {% endfor %}
-    </div>
-  </div>
-{% endmacro %}
diff --git a/templates/applications/fragments/new_member_modal_content.html b/templates/applications/fragments/new_member_modal_content.html
index bc3bd4d2..94bbc64e 100644
--- a/templates/applications/fragments/new_member_modal_content.html
+++ b/templates/applications/fragments/new_member_modal_content.html
@@ -1,8 +1,5 @@
 {% from "components/icon.html" import Icon %}
-{% from "components/text_input.html" import TextInput %}
-{% from "components/checkbox_input.html" import CheckboxInput %}
-{% from "components/phone_input.html" import PhoneInput %}
-{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %}
+{% import "applications/fragments/member_form_fields.html" as member_fields %}
 
 {% macro MemberFormTemplate(title, next_button, previous=True) %}
   <div class="modal__form--header">
@@ -36,22 +33,7 @@
   {% endset %}
 
   {% call MemberFormTemplate(title="portfolios.applications.members.form.add_member"|translate, next_button=next_button, previous=False) %}
-    <div class='form-row'>
-      {{ TextInput(member_form.user_data.first_name, validation='requiredField', optional=False) }}
-    </div>
-    <div class='form-row'>
-      {{ TextInput(member_form.user_data.last_name, validation='requiredField', optional=False) }}
-    </div>
-    <div class='form-row'>
-      {{ TextInput(member_form.user_data.email, validation='email', optional=False) }}
-    </div>
-    <div class="form-row">
-      {{ PhoneInput(member_form.user_data.phone_number, member_form.user_data.phone_ext)}}
-    </div>
-    <div class='form-row'>
-      {{ TextInput(member_form.user_data.dod_id, validation='dodId', optional=False) }}
-    </div>
-    <a href="#">How do I find the DoD ID?</a>
+    {{ member_fields.InfoFields(member_form.user_data) }}
   {% endcall %}
 {% endmacro %}
 {% macro MemberStepTwo(member_form, application) %}
@@ -64,6 +46,6 @@
   {% endset %}
 
   {% call MemberFormTemplate(title="portfolios.applications.members.form.step_2_title"|translate, next_button=next_button) %}
-    {{ MemberPermsFields(form=member_form) }}
+    {{ member_fields.PermsFields(form=member_form) }}
   {% endcall %}
 {% endmacro %}
diff --git a/templates/applications/settings.html b/templates/applications/settings.html
index c33db395..ad9cb377 100644
--- a/templates/applications/settings.html
+++ b/templates/applications/settings.html
@@ -4,7 +4,6 @@
 {% from "components/delete_confirmation.html" import DeleteConfirmation %}
 {% from "components/icon.html" import Icon %}
 {% import "applications/fragments/new_member_modal_content.html" as member_steps %}
-{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %}
 {% from "fragments/members.html" import MemberManagementTemplate %}
 {% from "components/modal.html" import Modal %}
 {% from "components/multi_step_modal_form.html" import MultiStepModalForm %}
@@ -75,11 +74,14 @@
   {% endif %}
 
   {{ MemberManagementTemplate(
-    application, 
-    members, 
+    application,
+    members,
     new_member_form,
     "applications.create_member",
-    user_can(permissions.CREATE_APPLICATION_MEMBER)) }}
+    user_can(permissions.CREATE_APPLICATION_MEMBER),
+    user_can(permissions.EDIT_APPLICATION_MEMBER),
+    user_can(permissions.DELETE_APPLICATION_MEMBER),
+  ) }}
 
   <div class="subheading">    
     {{ 'common.resource_names.environments' | translate }}
diff --git a/templates/fragments/members.html b/templates/fragments/members.html
index 9f43c93e..117e8923 100644
--- a/templates/fragments/members.html
+++ b/templates/fragments/members.html
@@ -1,20 +1,22 @@
 {% from "components/alert.html" import Alert %}
 {% from "components/icon.html" import Icon %}
 {% import "applications/fragments/new_member_modal_content.html" as member_steps %}
-{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %}
+{% import "applications/fragments/member_form_fields.html" as member_fields %}
 {% from "components/modal.html" import Modal %}
 {% from "components/multi_step_modal_form.html" import MultiStepModalForm %}
 {% from "components/save_button.html" import SaveButton %}
 
 {% macro MemberManagementTemplate(
-  application, 
+  application,
   members,
   new_member_form,
   action,
-  user_can_create_app_member=False
+  user_can_create_app_member=False,
+  user_can_edit_app_member=False,
+  user_can_delete_app_member=False
 ) %}
 
-  
+
   {% if g.matchesPath("application-members") %}
       {% include "fragments/flash.html" %}
   {% endif %}
@@ -52,28 +54,65 @@
 
   {% else %}
     {% set new_member_modal_name = "add-app-mem" %}
-    
+
     {% for member in members %}
-          {% set modal_name = "edit_member-{}".format(loop.index) %}
-          {% call Modal(modal_name) %}
+      {%- if user_can_edit_app_member %}
+        {% set modal_name = "edit_member-{}".format(loop.index) %}
+        {% call Modal(modal_name) %}
+          <div class="modal__form--header">
+            <h1>{{ Icon('avatar') }} {{ member.user_name }}</h1>
+            <hr>
+          </div>
+          <base-form inline-template>
+            <form id='{{ modal_name }}' method="POST" action="{{ url_for('applications.update_member', application_id=application.id, application_role_id=member.role_id) }}">
+              {{ member.form.csrf_token }}
+              {{ member_fields.PermsFields(form=member.form, member_role_id=member.role_id) }}
+              <div class="action-group">
+                {{ SaveButton(text='Update', element='input', additional_classes='action-group__action') }}
+                <a class='action-group__action usa-button usa-button-secondary' v-on:click="closeModal('{{ modal_name }}')">{{ "common.cancel" | translate }}</a>
+              </div>
+            </form>
+          </base-form>
+        {% endcall %}
+
+        {%- if member.role_status == 'pending' %}
+          {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
+          {% call Modal(resend_invite_modal) %}
             <div class="modal__form--header">
-              <h1>{{ Icon('avatar') }} {{ member.user_name }}</h1>
+              <h1>Verify Member Information</h1>
               <hr>
             </div>
             <base-form inline-template>
-              <form id='{{ modal_name }}' method="POST" action="{{ url_for('applications.update_member', application_id=application.id, application_role_id=member.role_id) }}">
-                {{ member.form.csrf_token }}
-                {{ MemberPermsFields(form=member.form, member_role_id=member.role_id) }}
+              <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='Update', element='input', additional_classes='action-group__action') }}
-                  <a class='action-group__action usa-button usa-button-secondary' v-on:click="closeModal('{{ modal_name }}')">{{ "common.cancel" | translate }}</a>
+                  {{ SaveButton(text='Resend Invite', element='input', additional_classes='action-group__action') }}
+                  <a class='action-group__action usa-button usa-button-secondary' v-on:click="closeModal('{{ resend_invite_modal }}')">{{ "common.cancel" | translate }}</a>
                 </div>
               </form>
             </base-form>
           {% endcall %}
-        {% endfor %}
+        {% endif -%}
+      {% endif -%}
+
+      {% if user_can_delete_app_member and member.role_status == 'pending' -%}
+        {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %}
+        {% call Modal(name=revoke_invite_modal, dismissable=True) %}
+          <div class="task-order__modal-cancel">
+            <form method="post" action="{{ url_for('applications.revoke_invite', application_id=application.id, application_role_id=member.role_id) }}">
+              {{ member.form.csrf_token }}
+              <h1>{{ "invites.revoke.modal_heading" | translate({'user_name': member.user_name}) }}</h1>
+              <div class="task-order__modal-cancel_buttons">
+                <button class="usa-button usa-button-primary" type="submit">{{ "invites.revoke.submit" | translate }}</button>
+                <button type='button' v-on:click='closeModal("{{revoke_invite_modal}}")' class="usa-button usa-button-primary">{{ "invites.revoke.cancel" | translate }}</button>
+              </div>
+            </form>
+          </div>
+        {% endcall %}
+      {%- endif %}
+    {% endfor %}
 
-    
     <section class="member-list application-list" id="application-members">
       <div class='responsive-table-wrapper'>
         <table class="atat-table">
@@ -112,10 +151,14 @@
                   {% endfor %}
                 </td>
                 <td>
-                  {% if member.role_status == 'pending' %}
-                    <a href="#">Resend Invite</a><br>
-                    <a href="#">Revoke Invite</a>
-                  {% endif %}
+                  {% if member.role_status == 'pending' -%}
+                    {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %}
+                    {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
+                    <a v-on:click='openModal("{{ resend_invite_modal }}")'>Resend Invite</a><br>
+                    {% if user_can_delete_app_member -%}
+                      <a v-on:click='openModal("{{ revoke_invite_modal }}")'>{{ 'invites.revoke.button' | translate }}</a>
+                    {%- endif %}
+                  {%- endif %}
                 </td>
               </tr>
             {% endfor %}
@@ -129,7 +172,6 @@
       </div>
 
       {% if user_can_create_app_member %}
-        {% import "applications/fragments/new_member_modal_content.html" as member_steps %}
         {{ MultiStepModalForm(
             name=new_member_modal_name,
             form=new_member_form,