diff --git a/app/abilities/provider.js b/app/abilities/provider.js
index 55e1e3a47..d986fda9c 100644
--- a/app/abilities/provider.js
+++ b/app/abilities/provider.js
@@ -13,6 +13,8 @@ export default class Provider extends Ability {
     switch (this.get('currentUser.role_id')) {
       case 'staff_admin':
         return true;
+      case 'consortium_admin':
+        return true;
       default:
         return false;
     }
@@ -23,11 +25,6 @@ export default class Provider extends Ability {
     switch (this.get('currentUser.role_id')) {
       case 'staff_admin':
         return true;
-      case 'consortium_admin':
-        return (
-          this.get('currentUser.provider_id') ===
-          this.get('model.consortium.id')
-        );
       default:
         return false;
     }
@@ -83,4 +80,44 @@ export default class Provider extends Ability {
         return false;
     }
   }
-}
+
+  @computed('currentUser.role_id', 'model.{id,provider_id}')
+  get canEditSalesforceField() {
+    switch (this.get('currentUser.role_id')) {
+      case 'staff_admin':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  @computed('currentUser.role_id', 'model.{id,provider_id}')
+  get canEditMemberTypeField() {
+    switch (this.get('currentUser.role_id')) {
+      case 'staff_admin':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  @computed('currentUser.role_id', 'model.{id,provider_id}')
+  get canEditConsortiumField() {
+    switch (this.get('currentUser.role_id')) {
+      case 'staff_admin':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  @computed('currentUser.role_id', 'model.{id,provider_id}')
+  get canEditActiveField() {
+    switch (this.get('currentUser.role_id')) {
+      case 'staff_admin':
+        return true;
+      default:
+        return false;
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/routes/providers/show/edit.js b/app/routes/providers/show/edit.js
index 79c30e055..8a97c9bd4 100644
--- a/app/routes/providers/show/edit.js
+++ b/app/routes/providers/show/edit.js
@@ -22,6 +22,7 @@ export default class EditRoute extends Route {
       return contact.deleted === null;
     })
     provider.set('filteredContacts', filteredContacts)
+    provider.set("consortium_id", this.modelFor('providers/show').get('consortium.id'));
 
     return provider;
   }
diff --git a/app/templates/providers/new.hbs b/app/templates/providers/new.hbs
index 506f11c4e..567b4b37f 100644
--- a/app/templates/providers/new.hbs
+++ b/app/templates/providers/new.hbs
@@ -109,25 +109,6 @@
                 {{titleize (humanize item)}}
               </el.control>
             </form.element>
-            <form.element
-              @controlType="power-select"
-              id="tax-status"
-              class="form-group"
-              @label="Tax Status"
-              @property="nonProfitStatus"
-              @options={{this.nonProfitStatuses}}
-              @destination={{this.nonProfitStatus}} as |el|
-            >
-              <el.control
-                @onChange={{action 'selectNonProfitStatus'}}
-                @search={{action 'searchNonProfitStatus'}}
-                @placeholder="Tax Status"
-                @searchPlaceholder="Type to search..."
-                @searchEnabled={{true}} as |item|
-              >
-                {{titleize item}}
-              </el.control>
-            </form.element>
             {{#if (eq this.model.memberType 'consortium_organization')}}
               <form.element
                 @controlType="power-select"
@@ -206,6 +187,25 @@
               {{item.name}}
             </el.control>
           </form.element>
+          <form.element
+            @controlType="power-select"
+            id="tax-status"
+            class="form-group"
+            @label="Tax Status"
+            @property="nonProfitStatus"
+            @options={{this.nonProfitStatuses}}
+            @destination={{this.nonProfitStatus}} as |el|
+          >
+            <el.control
+              @onChange={{action 'selectNonProfitStatus'}}
+              @search={{action 'searchNonProfitStatus'}}
+              @placeholder="Tax Status"
+              @searchPlaceholder="Type to search..."
+              @searchEnabled={{true}} as |item|
+            >
+              {{titleize item}}
+            </el.control>
+          </form.element>
           <form.element
             @controlType="power-select"
             id="organization-type"
diff --git a/app/templates/providers/show/edit.hbs b/app/templates/providers/show/edit.hbs
index df3143ada..571139c8b 100644
--- a/app/templates/providers/show/edit.hbs
+++ b/app/templates/providers/show/edit.hbs
@@ -55,7 +55,7 @@
           {{if item.name item.name this.model.rorId}}
         </el.control>
       </form.element>
-      {{#if (can 'create provider')}}
+      {{#if (can 'editSalesforceField provider')}}
         <form.element
           @controlType="text"
           id="salesforce-id"
@@ -75,7 +75,7 @@
           @helpText="The Globus UUID used for token authentication."
         />
       {{/if}}
-      {{#if (can 'create provider')}}
+      {{#if (can 'editMemberTypeField provider')}}
         <form.element
           @controlType="power-select"
           id="member-type"
@@ -96,25 +96,8 @@
             {{titleize (humanize item)}}
           </el.control>
         </form.element>
-        <form.element
-          @controlType="power-select"
-          id="tax-status"
-          class="form-group"
-          @label="Tax Status"
-          @property="nonProfitStatus"
-          @options={{this.nonProfitStatuses}}
-          @destination={{this.nonProfitStatus}} as |el|
-        >
-          <el.control
-            @onChange={{action 'selectNonProfitStatus'}}
-            @search={{action 'searchNonProfitStatus'}}
-            @placeholder="Tax Status"
-            @searchPlaceholder="Type to search..."
-            @searchEnabled={{true}} as |item|
-          >
-            {{titleize item}}
-          </el.control>
-        </form.element>
+      {{/if}}
+      {{#if (can 'editConsortiumField provider')}}
         {{#if (eq this.model.memberType 'consortium_organization')}}
           <form.element
             @controlType="power-select"
@@ -212,6 +195,38 @@
           {{item.name}}
         </el.control>
       </form.element>
+      {{#if (or 
+              (can 'create provider')
+              (and
+                (or (eq this.model.memberType 'consortium') 
+                    (and
+                      (eq this.model.memberType 'consortium_organization')
+                      (eq this.model.consortium_id this.model.consortium.id)
+                    )
+                )
+              )
+            )
+      }}
+        <form.element
+          @controlType="power-select"
+          id="tax-status"
+          class="form-group"
+          @label="Tax Status"
+          @property="nonProfitStatus"
+          @options={{this.nonProfitStatuses}}
+          @destination={{this.nonProfitStatus}} as |el|
+        >
+          <el.control
+            @onChange={{action 'selectNonProfitStatus'}}
+            @search={{action 'searchNonProfitStatus'}}
+            @placeholder="Tax Status"
+            @searchPlaceholder="Type to search..."
+            @searchEnabled={{true}} as |item|
+          >
+            {{titleize item}}
+          </el.control>
+        </form.element>
+      {{/if}}
       <form.element
         @controlType="power-select"
         id="organization-type"
@@ -583,7 +598,7 @@
           </form.element>
         {{/if}}
       {{/if}}
-      {{#if (can 'create provider')}}
+      {{#if (can 'editActiveField provider')}}
         <form.element
           @controlType="checkbox"
           id="is-active"
diff --git a/app/templates/providers/show/organizations/new.hbs b/app/templates/providers/show/organizations/new.hbs
index cf99a54ff..86950c2e5 100644
--- a/app/templates/providers/show/organizations/new.hbs
+++ b/app/templates/providers/show/organizations/new.hbs
@@ -75,7 +75,7 @@
           {{if item.name item.name this.model.organization.rorId}}
         </el.control>
       </form.element>
-      {{#if (can 'create provider')}}
+      {{#if (can 'editSalesforceField provider')}}
         <form.element
           @controlType="text"
           id="salesforce-id"
@@ -99,27 +99,6 @@
           <el.control id="globus-uuid-field" />
         </form.element>
       {{/if}}
-      {{#if (can 'create provider')}}
-        <form.element
-          @controlType="power-select"
-          id="tax-status"
-          class="form-group"
-          @label="Tax Status"
-          @property="nonProfitStatus"
-          @options={{this.nonProfitStatuses}}
-          @destination={{this.nonProfitStatus}} as |el|
-        >
-          <el.control
-            @onChange={{action 'selectNonProfitStatus'}}
-            @search={{action 'searchNonProfitStatus'}}
-            @placeholder="Tax Status"
-            @searchPlaceholder="Type to search..."
-            @searchEnabled={{true}} as |item|
-          >
-            {{titleize item}}
-          </el.control>
-        </form.element>
-      {{/if}}
       <form.element
         @controlType="text"
         id="system-email"
@@ -174,6 +153,27 @@
           {{item.name}}
         </el.control>
       </form.element>
+      {{#if (can 'create provider')}}
+        <form.element
+          @controlType="power-select"
+          id="tax-status"
+          class="form-group"
+          @label="Tax Status"
+          @property="nonProfitStatus"
+          @options={{this.nonProfitStatuses}}
+          @destination={{this.nonProfitStatus}} as |el|
+        >
+          <el.control
+            @onChange={{action 'selectNonProfitStatus'}}
+            @search={{action 'searchNonProfitStatus'}}
+            @placeholder="Tax Status"
+            @searchPlaceholder="Type to search..."
+            @searchEnabled={{true}} as |item|
+          >
+            {{titleize item}}
+          </el.control>
+        </form.element>
+      {{/if}}
       <form.element
         @controlType="power-select"
         id="organization-type"