diff --git a/.env.example b/.env.example
index 883c41856..9564b79b6 100644
--- a/.env.example
+++ b/.env.example
@@ -52,4 +52,14 @@ TEXTER_SIDEBOXES=celebration-gif,default-dynamicassignment,default-releasecontac
 OWNER_CONFIGURABLE=ALL
 NGP_VAN_API_KEY=
 NGP_VAN_APP_NAME=
-NGP_VAN_WEBHOOK_BASE_URL=
\ No newline at end of file
+NGP_VAN_WEBHOOK_BASE_URL=
+NGP_VAN_API_KEY_ENCRYPTED=
+NGP_VAN_API_BASE_URL=
+NGP_VAN_CACHE_TTL=
+NGP_VAN_EXPORT_JOB_TYPE_ID=
+NGP_VAN_MAXIMUM_LIST_SIZE=
+NGP_VAN_CAUTIOUS_CELL_PHONE_SELECTION=
+ACTION_HANDLERS=
+MESSAGE_HANDLERS=
+CONTACT_LOADERS=
+SERVICE_MANAGERS=
\ No newline at end of file
diff --git a/README.md b/README.md
index 34da8a9bc..456f27d40 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Spoke is an open source text-distribution tool for organizations to mobilize sup
 
 Spoke was created by Saikat Chakrabarti and Sheena Pakanati, and is now maintained by MoveOn.org.
 
-The latest version is [13.0.1](https://github.com/MoveOnOrg/Spoke/tree/13.0.1) (see [release notes](https://github.com/MoveOnOrg/Spoke/blob/main/docs/RELEASE_NOTES.md#v1301))
+The latest version is [13.1.0](https://github.com/MoveOnOrg/Spoke/tree/13.1.0) (see [release notes](https://github.com/MoveOnOrg/Spoke/blob/main/docs/RELEASE_NOTES.md#v1310))
 
 
 ## Setting up Spoke
@@ -24,7 +24,7 @@ Want to know more?
 ### Quick Start with Heroku
 This version of Spoke suitable for testing and, potentially, for small campaigns. This won't cost any money and will not support production(aka large-scale) usage. It's a great way to practice deploying Spoke or see it in action.  
 
-<a href="https://heroku.com/deploy?template=https://github.com/MoveOnOrg/Spoke/tree/13.0.1">
+<a href="https://heroku.com/deploy?template=https://github.com/MoveOnOrg/Spoke/tree/13.1.0">
 
   <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
 </a>
diff --git a/__test__/components/AssignmentSummary.test.js b/__test__/components/AssignmentSummary.test.js
index f12345339..1d806e6a2 100644
--- a/__test__/components/AssignmentSummary.test.js
+++ b/__test__/components/AssignmentSummary.test.js
@@ -22,6 +22,9 @@ function getAssignment({ isDynamic = false, counts = {} }) {
       id: "1",
       title: "New Campaign",
       description: "asdf",
+      organization: {
+        allowSendAll: window.ALLOW_SEND_ALL
+      },
       useDynamicAssignment: isDynamic,
       hasUnassignedContacts: false,
       introHtml: "yoyo",
@@ -79,7 +82,7 @@ describe("AssignmentSummary text", function t() {
   );
 });
 
-describe("AssignmentSummary actions inUSA and NOT AllowSendAll", () => {
+describe("AssignmentSummary actions when NOT AllowSendAll", () => {
   function create(
     unmessaged,
     unreplied,
@@ -88,7 +91,6 @@ describe("AssignmentSummary actions inUSA and NOT AllowSendAll", () => {
     skipped,
     isDynamic
   ) {
-    window.NOT_IN_USA = 0;
     window.ALLOW_SEND_ALL = false;
     return mount(
       <ApolloProvider client={ApolloClientSingleton}>
@@ -185,7 +187,7 @@ describe("AssignmentSummary actions inUSA and NOT AllowSendAll", () => {
   });
 });
 
-describe("AssignmentSummary NOT inUSA and AllowSendAll", () => {
+describe("AssignmentSummary when AllowSendAll", () => {
   function create(
     unmessaged,
     unreplied,
@@ -194,7 +196,6 @@ describe("AssignmentSummary NOT inUSA and AllowSendAll", () => {
     skipped,
     isDynamic
   ) {
-    window.NOT_IN_USA = 1;
     window.ALLOW_SEND_ALL = true;
     return mount(
       <AssignmentSummary
@@ -223,14 +224,14 @@ describe("AssignmentSummary NOT inUSA and AllowSendAll", () => {
     ).toBe("Send messages");
   });
 
-  it('renders "Send messages" with unreplied', () => {
+  it('renders "Respond" with unreplied', () => {
     const actions = create(0, 1, 0, 0, 0, false);
     expect(
       actions
         .find(Button)
         .at(0)
         .text()
-    ).toBe("Send messages");
+    ).toBe("Respond");
   });
 });
 
@@ -328,17 +329,21 @@ describe("contacts filters", () => {
         })}
       />
     );
-    const sendMessages = mockRender.mock.calls[0][0];
+    const respondMessages = mockRender.mock.calls[0][0];
+    expect(respondMessages.title).toBe("Respond");
+    expect(respondMessages.contactsFilter).toBe("reply");
+
+    const sendMessages = mockRender.mock.calls[1][0];
     expect(sendMessages.title).toBe("Past Messages");
     expect(sendMessages.contactsFilter).toBe("stale");
 
-    const skippedMessages = mockRender.mock.calls[1][0];
+    const skippedMessages = mockRender.mock.calls[2][0];
     expect(skippedMessages.title).toBe("Skipped Messages");
     expect(skippedMessages.contactsFilter).toBe("skipped");
 
-    const sendFirstTexts = mockRender.mock.calls[2][0];
+    const sendFirstTexts = mockRender.mock.calls[3][0];
     expect(sendFirstTexts.title).toBe("Send messages");
-    expect(sendFirstTexts.contactsFilter).toBe("all");
+    expect(sendFirstTexts.contactsFilter).toBe("text");
   });
 });
 
diff --git a/__test__/extensions/contact-loaders/ngpvan/ngpvan.test.js b/__test__/extensions/contact-loaders/ngpvan/ngpvan.test.js
index be96dab56..c108bf912 100644
--- a/__test__/extensions/contact-loaders/ngpvan/ngpvan.test.js
+++ b/__test__/extensions/contact-loaders/ngpvan/ngpvan.test.js
@@ -469,6 +469,7 @@ describe("ngpvan", () => {
         ["NGP_VAN_API_BASE_URL", organization],
         ["NGP_VAN_TIMEOUT", organization],
         ["NGP_VAN_APP_NAME", organization],
+        ["NGP_VAN_API_KEY_ENCRYPTED", organization, {}],
         ["NGP_VAN_API_KEY", organization],
         ["NGP_VAN_DATABASE_MODE", organization],
         ["NGP_VAN_EXPORT_JOB_TYPE_ID", organization],
diff --git a/__test__/extensions/contact-loaders/ngpvan/util.test.js b/__test__/extensions/contact-loaders/ngpvan/util.test.js
index d2d72fb13..261d4e803 100644
--- a/__test__/extensions/contact-loaders/ngpvan/util.test.js
+++ b/__test__/extensions/contact-loaders/ngpvan/util.test.js
@@ -120,12 +120,13 @@ describe("ngpvan/util", () => {
       }
 
       try {
-        auth = Van.getAuth(organization);
+        auth = await Van.getAuth(organization);
       } catch (caughtException) {
         error = caughtException;
       } finally {
         expect(config.getConfig.mock.calls).toEqual([
           ["NGP_VAN_APP_NAME", organization],
+          ["NGP_VAN_API_KEY_ENCRYPTED", organization, {}],
           ["NGP_VAN_API_KEY", organization],
           ["NGP_VAN_DATABASE_MODE", organization]
         ]);
diff --git a/__test__/extensions/service-vendors/twilio.test.js b/__test__/extensions/service-vendors/twilio.test.js
index 7d4485f67..cea2f4079 100644
--- a/__test__/extensions/service-vendors/twilio.test.js
+++ b/__test__/extensions/service-vendors/twilio.test.js
@@ -849,7 +849,6 @@ describe("config functions", () => {
               ["TWILIO_ACCOUNT_SID", organization, expectedConfigOpts]
             ]);
             expect(configFunctions.getConfig.mock.calls).toEqual([
-              ["TWILIO_AUTH_TOKEN_ENCRYPTED", organization, expectedConfigOpts],
               ["TWILIO_AUTH_TOKEN_ENCRYPTED", organization, expectedConfigOpts],
               ["TWILIO_ACCOUNT_SID", organization, expectedConfigOpts],
               ["TWILIO_ACCOUNT_SID", organization, expectedConfigOpts],
diff --git a/__test__/server/api/campaign/campaign.test.js b/__test__/server/api/campaign/campaign.test.js
index 7dd6f5a7b..9884eabbb 100644
--- a/__test__/server/api/campaign/campaign.test.js
+++ b/__test__/server/api/campaign/campaign.test.js
@@ -863,7 +863,8 @@ describe("Bulk Send", () => {
   ) => {
     process.env.ALLOW_SEND_ALL = params.allowSendAll;
     process.env.ALLOW_SEND_ALL_ENABLED = params.allowSendAllEnabled;
-    process.env.BULK_SEND_CHUNK_SIZE = params.bulkSendChunkSize;
+    process.env.BULK_SEND_BATCH_SIZE =
+      params.bulkSendBatchSize || params.bulkSendChunkSize;
 
     testCampaign.use_dynamic_assignment = true;
     await createScript(testAdminUser, testCampaign);
@@ -1014,6 +1015,20 @@ describe("Bulk Send", () => {
     };
     await testBulkSend(params, 0, expectErrorBulkSending);
   });
+
+  it("should send initial texts to as many contacts as are in the batch size if batch size is smaller than the chunk size", async () => {
+    const params = {
+      allowSendAll: true,
+      allowSendAllEnabled: true,
+      bulkSendBatchSize: Math.round(NUMBER_OF_CONTACTS / 4),
+      bulkSendChunkSize: NUMBER_OF_CONTACTS
+    };
+    await testBulkSend(
+      params,
+      params.bulkSendBatchSize,
+      expectSuccessBulkSending(params.bulkSendBatchSize)
+    );
+  });
 });
 
 describe("campaigns query", () => {
diff --git a/__test__/server/api/people.test.js b/__test__/server/api/people.test.js
index 3496f4209..beeb84700 100644
--- a/__test__/server/api/people.test.js
+++ b/__test__/server/api/people.test.js
@@ -1,7 +1,12 @@
+/**
+ * @jest-environment jsdom
+ */
 /* eslint-disable no-unused-expressions, consistent-return */
 import { r } from "../../../src/server/models/";
 import { getUsersGql } from "../../../src/containers/PeopleList";
 import { GraphQLError } from "graphql/error";
+import { resolvers } from "../../../src/server/api/schema";
+import { validate as uuidValidate } from 'uuid';
 
 import {
   setupTest,
@@ -479,4 +484,49 @@ describe("people", () => {
       ]);
     });
   });
+
+  describe("reset password", () => {
+    /**
+     * Run the resetUserPassword mutation
+     * @param {number} organizationId 
+     * @param {number} texterId 
+     * @param {number} userId 
+     * @returns Promise
+     */
+    function resetUserPassword(admin, organizationId, texterId) {
+      return resolvers.RootMutation.resetUserPassword(null, {
+        organizationId: organizationId,
+        userId: texterId
+      }, {
+        loaders: {
+          organization: {
+            load: async id => {
+              return (await r.knex("organization").where({ id }))[0];
+            }
+          }
+        },
+        user: admin
+      });
+    }
+
+    it("reset local password", () => {
+      resetUserPassword(testAdminUsers[0], organizationId, testTexterUsers[0].id).then(uuid => {
+        // Non-Auth0 password reset will return verion 4 UUID
+        expect(uuidValidate(uuid)).toBeTruthy();
+      });
+    });
+
+    it("reset Auth0 password", () => {
+      // Remove PASSPORT_STRATEGY env var. PASSPORT_STRATEGY will default to "auth0" if there's nothing explicitly set
+      delete window.PASSPORT_STRATEGY;
+
+      resetUserPassword(testAdminUsers[0], organizationId, testTexterUsers[0].id).catch(e => {
+        // Auth0 password reset will attempt to make HTTP request, which will fail in Jest test
+        const match = e.message.match(/Error: Request id (.*) failed; all 2 retries exhausted/);
+
+        expect(match).toHaveLength(2);
+        expect(uuidValidate(match[1])).toBeTruthy();
+      });
+    });
+  });
 });
diff --git a/app.json b/app.json
index 9495516b8..a52f7d49e 100644
--- a/app.json
+++ b/app.json
@@ -44,19 +44,18 @@
     },
 
     "DEFAULT_SERVICE": {
-      "description": "specifies using twilio api ",
-      "required": true,
-      "value": "twilio"
+      "description": "type bandwidth or twilio",
+      "required": true
     },
 
     "TWILIO_ACCOUNT_SID": {
       "description": "for twilio integration and connected to twilio account",
-      "required": true
+      "required": false
     },
 
     "TWILIO_AUTH_TOKEN": {
       "description": "for twilio integration and connected to twilio account",
-      "required": true
+      "required": false
     },
 
     "TWILIO_MULTI_ORG": {
@@ -184,9 +183,9 @@
     }
   },
   "addons": [
-    "heroku-postgresql:hobby-dev",
+    "heroku-postgresql:basic",
     {
-      "plan": "heroku-redis:hobby-dev",
+      "plan": "heroku-redis:mini",
       "options": {
         "maxmemory-policy": "volatile-lru"
       }
diff --git a/docs/HOWTO-configure-auth0.md b/docs/HOWTO-configure-auth0.md
index 6e01eb44d..381fed832 100644
--- a/docs/HOWTO-configure-auth0.md
+++ b/docs/HOWTO-configure-auth0.md
@@ -51,7 +51,7 @@ callback(null, user, context);
       <script src="https://cdn.auth0.com/js/base64.js"></script>
       <script src="https://cdn.auth0.com/js/es5-shim.min.js"></script>
       <![endif]-->
-      <script src="https://cdn.auth0.com/js/lock/11.28/lock.min.js"></script>
+      <script src="https://cdn.auth0.com/js/lock/11.34.2/lock.min.js"></script>
       <script>
         // Decode utf8 characters properly
         var config = JSON.parse(decodeURIComponent(escape(window.atob('@@config@@'))));
diff --git a/docs/HOWTO-use-texter-sideboxes.md b/docs/HOWTO-use-texter-sideboxes.md
index 8e5fdaa12..11cbcbd6c 100644
--- a/docs/HOWTO-use-texter-sideboxes.md
+++ b/docs/HOWTO-use-texter-sideboxes.md
@@ -75,6 +75,10 @@ Mobilize (America) event scheduling. User clicks the button and the MOBILIZE_EVE
 
 Note: as of 3/1/21 you will need to reach out to Mobilize support to have them enable embedding for your dashboard(s), otherwise you'll probably get the error `Refused to display '{MOBILIZE_EVENT_SHIFTER_URL}' in a frame because it set 'X-Frame-Options' to 'sameorigin'.`
 
+### per-campaign-bulk-send
+
+This texter sidebox allows you to enable or disable bulk send per campaign. To use this texter sidebox, bulk send must be enabled in your Spoke instance.
+
 ### tag-contact
 
 If you create tags related to 'escalation' or something you want texters to be able to mark
diff --git a/docs/HOWTO-use_bulk_sending_outside_the_USA.md b/docs/HOWTO-use_bulk_sending.md
similarity index 73%
rename from docs/HOWTO-use_bulk_sending_outside_the_USA.md
rename to docs/HOWTO-use_bulk_sending.md
index b5a83cc80..0e42c584c 100644
--- a/docs/HOWTO-use_bulk_sending_outside_the_USA.md
+++ b/docs/HOWTO-use_bulk_sending.md
@@ -6,6 +6,8 @@
 
 If Spoke is configured to do bulk sending, a `Send Bulk` button will appear on the texter's view for the first contact. When the texter clicks that button, the next chunk of contacts will receive the initial message. After Spoke queues up messages for those contacts, if there are any contacts left in the texter's assignment, the next chunk of contacts will receive messages the next time the texter clicks `Send Bulk`.
 
+If you navigate away from the page or your computer falls asleep during a bulk send, the send will be interrupted. You must refresh the page and click the `Send Bulk` button again to continue sending messages. You can check on the progress of a bulk send by opening Developer Tools and looking at the console logs.
+
 Only contacts needing the initial message will receive a message.
 
 ## After confirming that you can legally use the feature
@@ -14,7 +16,7 @@ Refer to [REFERENCE-environment_variables.md](REFERENCE-environment_variables.md
 
 1. Set the environment variable `ALLOW_SEND_ALL` to `true`.
 2. Set the environment variable `BULK_SEND_CHUNK_SIZE` to a number greater than 0.
-3. Set the environment variable `NOT_IN_USA` to `true`.
+3. Set the environment variable `BULK_SEND_BATCH_SIZE` to a number greater than 0 and less than or equal to `BULK_SEND_CHUNK_SIZE`.
 4. Restart Spoke.
 
 ## Example: `.env` file
@@ -23,6 +25,6 @@ If you use a `.env` file to configure Spoke, the changes above would appear as f
 
 ```
 ALLOW_SEND_ALL=true
-BULK_SEND_CHUNK_SIZE=30
-NOT_IN_USA=true
+BULK_SEND_CHUNK_SIZE=50000
+BULK_SEND_BATCH_SIZE=400
 ```
diff --git a/docs/REFERENCE-NGPVAN_user_guide.md b/docs/REFERENCE-NGPVAN_user_guide.md
index b20a63b63..5626d5cbf 100644
--- a/docs/REFERENCE-NGPVAN_user_guide.md
+++ b/docs/REFERENCE-NGPVAN_user_guide.md
@@ -15,30 +15,27 @@ This is a user guide for integrating with VAN. Though the integration is referre
 
 To request an API Key, go to the API integrations page from the sidebar menu, and click request API key. Request a 'Spoke Main Branch' API key.
 
-You can use this integration with one API key for your whole Spoke build, or with different API keys for each organization in a multi-organization setup. Either way, you will likely want to set NGP_VAN_WEBHOOK_BASE_URL globally to the base URL for wherever you host spoke (i.e. the same value as BASE_URL).
-
-Regardless of whether you are using one key for your whole build or per-org keys, if you would like to use data from MyCampaign (as opposed to my voters), append |1 to the end of the API key you are given when saving it to your database or as an environment variable.
+You can use this integration with one API key for your whole Spoke build, or with different API keys for each organization in a multi-organization setup. Either way, you will likely want to set `NGP_VAN_WEBHOOK_BASE_URL` globally to the base URL for wherever you host spoke (i.e. the same value as `BASE_URL`).
 
 ### Setting a single API key for your whole build
 
-Set the NGP_VAN_API_KEY environment variable to your API key, and the NGP_VAN_APP_NAME to the associated user name (usually something like NY001.spoke.api or similar).
+Set the `NGP_VAN_API_KEY` environment variable to your API key, and the `NGP_VAN_APP_NAME` to the associated user name (usually something like NY001.spoke.api or similar).
+
+If you would like to use data from MyCampaign (as opposed to MyVoters), set `NGP_VAN_DATABASE_MODE` to `1`.
 
 If you are using Redis, you may need to clear the cache when you add or make changes to the API key; you can do this from your Redis CLI with FLUSHDB (though this is not recommended in the middle of high amounts of active use) or by deleting the in individual associate keys [TODO: what are the proper keys to clear here?]
 
 ### Using different API keys for each organization
 
-You can set individual API keys for some or all of your organizations by editing the features column in the organziation table of your database directly. This column is in JSON format so if no other features are set for the organization, you would set the value to 
-
-{"NGP_VAN_API_KEY":"[key]", "NGP_VAN_APP_NAME":"[app_name]"}
-
-After saving this change in your database, if you are using Redis, you should clear the cache for this organization by going to Settings in Spoke and clicking the "Clear Cached Organization and Extension Caches"
-button.
+You can set individual API keys for some or all of your organizations by enabling the NGPVAN service manager. The service manager will add options to the organization settings page allowing you to override the `NGP_VAN_API_KEY`, `NGP_VAN_APP_NAME`, and `NGP_VAN_DATABASE_MODE` variables. API keys are encrypted before being stored in the database.
 
 When organizations do not have these variables individually set, if these variables are globally set, Spoke will fall back to using those credentials.
 
+To enable per-organiziation VAN keys, add `ngpvan` to the list in your `SERVICE_MANAGERS` environment variable.
+
 ## The Contact Loader
 
-The contact loader allows you to choose a saved list (but not a saved search) in VAN as your contact source. All the fields that are available for your contacts in VAN will be available for personalization in Spoke, including handy things like polling location and district (though those fields will of course only be as accurate as they were in VAN). To use the contact loader, ngpvan must appear in the list in your CONTACT_LOADERS envirornment variable.
+The contact loader allows you to choose a saved list (but not a saved search) in VAN as your contact source. All the fields that are available for your contacts in VAN will be available for personalization in Spoke, including handy things like polling location and district (though those fields will of course only be as accurate as they were in VAN). To use the contact loader, `ngpvan` must appear in the list in your `CONTACT_LOADERS` envirornment variable.
 
 Loading lists from VAN in Spoke does <b>not</b> involve the SMS button in VAN. Instead, make a folder or folders in VAN where you plan to save the lists you would like to use. Edit that folder, and give the API User for the key you requested access to that folder as you would any other user. Going forward, any list you save to that folder will show up in Spoke--select NGPVAN as the Contact Load Method and start typing the list name, then select it from the typeahead when it appears.
 
@@ -48,12 +45,12 @@ Can't find your list? These are common reasons folks run into issues:
 
 * Is this a saved list, and not a saved search?
 * Did you save it in a folder where the proper API user has access?
-* If the list is over 75,000 people, it will not appear by default. You can cut it into smaller lists, or change the maximum list size by changing NGP_VAN_MAXIMUM_LIST_SIZE. For large lists, you also run a bigger risk of the request to VAN to load the list timing out; you can change the maximum timeout length with NGP_VAN_TIMEOUT.
+* If the list is over 75,000 people, it will not appear by default. You can cut it into smaller lists, or change the maximum list size by changing `NGP_VAN_MAXIMUM_LIST_SIZE`. For large lists, you also run a bigger risk of the request to VAN to load the list timing out; you can change the maximum timeout length with `NGP_VAN_TIMEOUT`.
 * If none of the above issues seem to apply in your case, there may be a caching issue, particularly if you just set up the VAN integration. Clearing the cache in Settings --> External configuration sometimes helps, as does logging out and back in.
 
 ## The Action Handler
 
-The action handler allows you to sync data back to VAN as part of your script. Data saves to VAN are triggered in the same way answers to questions you incorporate in your script are saved in Spoke, i.e. when the texter selects an answer to a question you have constructed, and then sends a subsequent message, clicks Skip, or opts the contact out. To use the action handler, ngpvan must appear in the list in your ACTION_HANDLERS envirornment variable.
+The action handler allows you to sync data back to VAN as part of your script. Data saves to VAN are triggered in the same way answers to questions you incorporate in your script are saved in Spoke, i.e. when the texter selects an answer to a question you have constructed, and then sends a subsequent message, clicks Skip, or opts the contact out. To use the action handler, `ngpvan` must appear in the list in your `ACTION_HANDLERS` envirornment variable.
 
 For each question answer, you can select an appropriate action by selecting NGPVAN from the dropdown and starting to type. Your options will be drawn from Canvass Response Codes, Activist Codes, and Survey Question answers you have set up in VAN.
 
@@ -61,4 +58,4 @@ An important note: by far the easiest way to use the Action Handler is when you
 
 ## The Message Handler
 
-The message handler will simply mark every contact you message as messaged in VAN, in that contact's Contact History. By default the contact result will be 'Texted' but this can be modified via changing DEFAULT_NGP_VAN_INITIAL_TEXT_CANVASS_RESULT in your environment variables. To use the message handler, ngpvan must appear in the list in your MESSAGE_HANLDERS environment variable, <b>and</b> you must be using the NGPVAN action handler (see above, including the caveat about using the handlers when loading from a CSV).
\ No newline at end of file
+The message handler will simply mark every contact you message as messaged in VAN, in that contact's Contact History. By default the contact result will be 'Texted' but this can be modified via changing `DEFAULT_NGP_VAN_INITIAL_TEXT_CANVASS_RESULT` in your environment variables. To use the message handler, `ngpvan` must appear in the list in your `MESSAGE_HANLDERS` environment variable, <b>and</b> you must be using the NGPVAN action handler (see above, including the caveat about using the handlers when loading from a CSV).
diff --git a/docs/REFERENCE-environment_variables.md b/docs/REFERENCE-environment_variables.md
index cb3b86063..ac02d4c57 100644
--- a/docs/REFERENCE-environment_variables.md
+++ b/docs/REFERENCE-environment_variables.md
@@ -1,6 +1,7 @@
 | Variable                                         | Purpose                                                                                                                                                                                                                                                                                                                                                                                     |
 | ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | ACTION_HANDLERS                                       |  Optional Action Handlers, listed in [extensions/action-handlers](https://github.com/MoveOnOrg/Spoke/tree/main/src/extensions/action-handlers). _`ngpvan-action` required for VAN integration_                                                                                                                                                                                                                                                                                                      |
+| ALLOW_SEND_ALL                                        | Allow usage of the ["Bulk Send" feature](HOWTO-use_bulk_sending.md).                                                                                                                                                                                                                                                                                                                                                                    |
 | APOLLO_OPTICS_KEY                                | A key for Apollo tracer.                                                                                                                                                                                                                                                                                                                                                                    |
 | ASSETS_DIR                                       | Directory path where front-end packaged JavaScript is saved and loaded. _Required_.                                                                                                                                                                                                                                                                                                         |
 | ASSETS_MAP_FILE                                  | File name of map file, within ASSETS_DIR, containing map of general file names to unique build-specific file names.                                                                                                                                                                                                                                                                         |
@@ -14,6 +15,8 @@
 | AWS_S3_BUCKET_NAME                               | Name of S3 bucket for saving campaign exports.                                                                                                                                                                                                                                                                                                                                              |
 | AWS_REGION                                       | Region of S3 bucket for saving campaign exports.                                                                                                                                                                                                                                                                                                                                        |
 | BASE_URL                                         | The base URL of the website, without trailing slash, e.g. `https://example.org`, used to construct various URLs.                                                                                                                                                                                                                                                                            |
+| BULK_SEND_BATCH_SIZE                             | The number of texts to send out in 1 API call when using bulk send. Necessary to mitigate performance and timeout issues when BULK_SEND_CHUNK_SIZE is large.                                                                                                                                                                                                                                                                            |
+| BULK_SEND_CHUNK_SIZE                             | The number of texts to send out with 1 click of the "Bulk Send" button.                                                                                                                                                                                                                                                                            |
 | CACHE_PREFIX                                     | If REDIS_URL is set, then this will prefix keys CACHE_PREFIX, which might be useful if multiple applications use the same redis server. _Default_: "".                                                                                                                                                                                                                                     |
 | CAMPAIGN_ID                                      | Campaign ID used by `dev-tools/export-query.js` to identify which campaign should be exported.                                                                                                                                                                                                                                                                                              |
 | CAMPAIGN_INVITES_CURRENT_USERS_ONLY              | Campaign invites will only work for already-joined organization users (instead of auto-joining them to the organization) |
diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md
index f83c8aa4a..336a93eb1 100644
--- a/docs/RELEASE_NOTES.md
+++ b/docs/RELEASE_NOTES.md
@@ -1,5 +1,27 @@
 # Release Notes
 
+## v13.1.0
+_October 2023_ Version 13.1.0
+
+13.1.0 is a minor release.
+
+### Bug Fixes
+* Upgrade Auth0 Lock
+* Fix Auth0 password reset issue
+* Update Heroku deployment
+
+### Improvements
+* Remove required Twilio fields
+* Bump dependencies
+* Mobile-compatible texter UI
+
+### New Features
+* Per-campaign bulk send
+* NGP VAN service manager
+
+### Appreciations
+* [Arique Aguilar](https://github.com/Arique1104), [Ilona Brand](https://github.com/ibrand), [Jeff Mann](https://github.com/jeffm2001), [Karim Al-Rashdan](https://github.com/KarimAl-Rashdan), [Kathy Nguyen](https://github.com/crayolakat), [Shibam Debnath](https://github.com/SshibamDebnathh), and Harold Travis for QA.
+
 ## v13.0.1
 _September 2023_ Version 13.0.1
 
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index c3ed6a141..a915012d8 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -9,7 +9,7 @@
   - [Sample SQL queries for tracking texter activity](REFERENCE_TEXTER_ACTIVITY_QUERIES.md)
   - [Configuring texting hours enforcement](HOWTO_TEXTING_HOURS_ENFORCEMENT.md)
   - [How to buy numbers in Spoke](HOWTO_BUY_NUMBERS_IN_SPOKE.md)
-  - [How to configure bulk sending outside the USA](HOWTO-use_bulk_sending_outside_the_USA.md)
+  - [How to configure bulk sending](HOWTO-use_bulk_sending.md)
   - [NGPVAN integration user guide](REFERENCE-NGPVAN_user_guide.md)
 
 - Extensions Docs
diff --git a/package.json b/package.json
index 98e05264d..3395c857f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spoke",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "Spoke",
   "main": "src/server",
   "engines": {
@@ -129,7 +129,7 @@
     "isomorphic-fetch": "^2.2.1",
     "jest-each": "^0.3.1",
     "json-loader": "^0.5.4",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "knex": "^2.3.0",
     "lodash": "^4.13.1",
     "mailgun-js": "^0.20.0",
@@ -163,7 +163,7 @@
     "twilio": "^3.40.0",
     "url-join": "^4.0.1",
     "us-area-codes": "^1.0.0",
-    "uuid": "^3.1.0",
+    "uuid": "^9.0.0",
     "wait-for-expect": "^1.1.1",
     "webpack": "^5.74.0",
     "webpack-manifest-plugin": "^5.0.0",
diff --git a/readmestaging20180902 b/readmestaging20180902
deleted file mode 100644
index 4cdae09ed..000000000
--- a/readmestaging20180902
+++ /dev/null
@@ -1 +0,0 @@
-Creating branch staging2010902.  
diff --git a/src/components/AssignmentSummary.jsx b/src/components/AssignmentSummary.jsx
index b3cd36bf6..3cee8d080 100644
--- a/src/components/AssignmentSummary.jsx
+++ b/src/components/AssignmentSummary.jsx
@@ -143,6 +143,7 @@ export class AssignmentSummaryBase extends Component {
     // NOTE: we bring back archived campaigns if they have feedback
     // but want to get rid of them once feedback is acknowledged
     if (campaign.isArchived && !hasPopupSidebox) return null;
+    const campaignAllowBulkSend = texterUIConfig && texterUIConfig.sideboxChoices && texterUIConfig.sideboxChoices.includes("per-campaign-bulk-send") ? settingsData["per-campaign-bulk-send"] : true;
     return (
       <div
         className={css(styles.container)}
@@ -174,7 +175,9 @@ export class AssignmentSummaryBase extends Component {
             {(hasPopupSidebox && sideboxList) || null}
 
             <div className={css(styles.buttonRow)}>
-              {(window.NOT_IN_USA && window.ALLOW_SEND_ALL) || hasPopupSidebox
+              {(this.props.assignment.campaign.organization.allowSendAll &&
+                campaignAllowBulkSend) ||
+              hasPopupSidebox
                 ? null
                 : this.renderBadgedButton({
                     dataTestText: "sendFirstTexts",
@@ -187,7 +190,7 @@ export class AssignmentSummaryBase extends Component {
                     hideIfZero: true,
                     color: "primary"
                   })}
-              {(window.NOT_IN_USA && window.ALLOW_SEND_ALL) || hasPopupSidebox
+              {hasPopupSidebox
                 ? null
                 : this.renderBadgedButton({
                     dataTestText: "Respond",
@@ -226,13 +229,15 @@ export class AssignmentSummaryBase extends Component {
                 color: "secondary",
                 hideBadge: true
               })}
-              {window.NOT_IN_USA && window.ALLOW_SEND_ALL && !hasPopupSidebox
+              {this.props.assignment.campaign.organization.allowSendAll &&
+              campaignAllowBulkSend &&
+              !hasPopupSidebox
                 ? this.renderBadgedButton({
                     assignment,
                     title: "Send messages",
                     primary: true,
                     disabled: false,
-                    contactsFilter: "all",
+                    contactsFilter: "text",
                     count: 0,
                     hideIfZero: false,
                     color: "primary"
diff --git a/src/components/AssignmentTexter/BulkSendButton.jsx b/src/components/AssignmentTexter/BulkSendButton.jsx
index 7fe190375..a73b22581 100644
--- a/src/components/AssignmentTexter/BulkSendButton.jsx
+++ b/src/components/AssignmentTexter/BulkSendButton.jsx
@@ -20,9 +20,27 @@ export default class BulkSendButton extends Component {
   };
 
   sendMessages = async () => {
+    let sentMessages = 0;
+
     this.setState({ isSending: true });
     this.props.setDisabled(true);
-    await this.props.bulkSendMessages(this.props.assignment.id);
+
+    console.log(`Start bulk sending messages ${new Date()}`);
+    while (sentMessages < window.BULK_SEND_CHUNK_SIZE) {
+      const res = await this.props.bulkSendMessages(this.props.assignment.id);
+
+      // Check if all messages have been sent
+      if (!res.data.bulkSendMessages.length) {
+        break;
+      }
+
+      // Print progress to console
+      sentMessages += res.data.bulkSendMessages.length;
+      console.log(`Bulk sent ${sentMessages} messages ${new Date()}`);
+    }
+    this.props.refreshData();
+    console.log(`Finish bulk sending messages ${new Date()}`);
+
     this.setState({ isSending: false });
     this.props.setDisabled(false);
     this.props.onFinishContact();
@@ -50,5 +68,6 @@ BulkSendButton.propTypes = {
   assignment: PropTypes.object,
   onFinishContact: PropTypes.func,
   bulkSendMessages: PropTypes.func,
+  refreshData: PropTypes.func,
   setDisabled: PropTypes.func
 };
diff --git a/src/components/AssignmentTexter/Controls.jsx b/src/components/AssignmentTexter/Controls.jsx
index f6a4dd175..fe47ed1bd 100644
--- a/src/components/AssignmentTexter/Controls.jsx
+++ b/src/components/AssignmentTexter/Controls.jsx
@@ -509,8 +509,8 @@ export class AssignmentTexterContactControls extends React.Component {
 
     const otherResponsesLink =
       currentInteractionStep &&
-      currentInteractionStep.question.filteredAnswerOptions.length > 6 &&
-      filteredCannedResponses.length ? (
+        currentInteractionStep.question.filteredAnswerOptions.length > 6 &&
+        filteredCannedResponses.length ? (
         <div className={css(flexStyles.popoverLink)} key={"otherresponses"}>
           <a
             href="#otherresponses"
@@ -523,8 +523,8 @@ export class AssignmentTexterContactControls extends React.Component {
 
     const searchBar = currentInteractionStep &&
       currentInteractionStep.question.answerOptions.length +
-        campaign.cannedResponses.length >
-        5 && (
+      campaign.cannedResponses.length >
+      5 && (
         <SearchBar
           onRequestSearch={this.handleSearchChange}
           onChange={this.handleSearchChange}
@@ -662,12 +662,12 @@ export class AssignmentTexterContactControls extends React.Component {
                   margin: "9px",
                   color:
                     this.state.optOutMessageText ===
-                    this.props.campaign.organization.optOutMessage
+                      this.props.campaign.organization.optOutMessage
                       ? "white"
                       : "#494949",
                   backgroundColor:
                     this.state.optOutMessageText ===
-                    this.props.campaign.organization.optOutMessage
+                      this.props.campaign.organization.optOutMessage
                       ? "#727272"
                       : "white"
                 }}
@@ -880,9 +880,9 @@ export class AssignmentTexterContactControls extends React.Component {
       shortCannedResponses = shortCannedResponses.filter(script => {
         var textLength = global.HIDE_BRANCHED_SCRIPTS
           ? this.getShortButtonText(
-              script.title,
-              cannedResponseScript ? 40 : 13
-            ).length
+            script.title,
+            cannedResponseScript ? 40 : 13
+          ).length
           : script.title.length;
 
         if (joinedLength + 1 + textLength < 80) {
@@ -966,7 +966,7 @@ export class AssignmentTexterContactControls extends React.Component {
       <div className={css(flexStyles.subButtonsExitButtons)}>
         <Button
           onClick={
-            !disabled ? this.handleOpenAnswerResponsePopover : noAction => {}
+            !disabled ? this.handleOpenAnswerResponsePopover : noAction => { }
           }
           style={{
             backgroundColor: this.props.muiTheme.palette.background.default,
@@ -1043,6 +1043,7 @@ export class AssignmentTexterContactControls extends React.Component {
       <div key="sectionButtons" className={css(flexStyles.sectionButtons)}>
         <div
           className={css(flexStyles.subButtonsAnswerButtons)}
+          style={{ height: "10%" }}
           ref="answerButtons"
         >
           {currentQuestion &&
@@ -1197,40 +1198,40 @@ export class AssignmentTexterContactControls extends React.Component {
     const content = firstMessage
       ? this.renderFirstMessage(enabledSideboxes)
       : [
-          this.renderToolbar(enabledSideboxes),
-          <div
-            key="superSectionMessagePage"
-            className={css(flexStyles.superSectionMessagePage)}
-          >
-            {this.state.contactListOpen &&
-              this.renderAssignmentContactsList(
-                this.props.assignment.contacts,
-                this.props.contact,
-                this.props.updateCurrentContactById
-              )}
-            <div className={css(flexStyles.superSectionMessageListAndControls)}>
-              <ContactToolbar
-                campaignContact={this.props.contact}
-                campaign={this.props.campaign}
-                navigationToolbarChildren={this.props.navigationToolbarChildren}
-                toggleContactList={this.toggleContactList}
-              />
-              {this.renderMessageBox(
-                <MessageList
-                  contact={this.props.contact}
-                  currentUser={this.props.currentUser}
-                  messages={this.props.contact.messages}
-                  organizationId={this.props.organizationId}
-                  review={this.props.review}
-                  styles={messageListStyles}
-                  hideMedia={this.state.hideMedia}
-                />,
-                enabledSideboxes
-              )}
-              {this.renderMessageControls(enabledSideboxes)}
-            </div>
+        this.renderToolbar(enabledSideboxes),
+        <div
+          key="superSectionMessagePage"
+          className={css(flexStyles.superSectionMessagePage)}
+        >
+          {this.state.contactListOpen &&
+            this.renderAssignmentContactsList(
+              this.props.assignment.contacts,
+              this.props.contact,
+              this.props.updateCurrentContactById
+            )}
+          <div className={css(flexStyles.superSectionMessageListAndControls)}>
+            <ContactToolbar
+              campaignContact={this.props.contact}
+              campaign={this.props.campaign}
+              navigationToolbarChildren={this.props.navigationToolbarChildren}
+              toggleContactList={this.toggleContactList}
+            />
+            {this.renderMessageBox(
+              <MessageList
+                contact={this.props.contact}
+                currentUser={this.props.currentUser}
+                messages={this.props.contact.messages}
+                organizationId={this.props.organizationId}
+                review={this.props.review}
+                styles={messageListStyles}
+                hideMedia={this.state.hideMedia}
+              />,
+              enabledSideboxes
+            )}
+            {this.renderMessageControls(enabledSideboxes)}
           </div>
-        ];
+        </div>
+      ];
     return (
       <div
         className={css(flexStyles.topContainer)}
diff --git a/src/components/AssignmentTexter/StyleControls.js b/src/components/AssignmentTexter/StyleControls.js
index f6f939032..201ed145a 100644
--- a/src/components/AssignmentTexter/StyleControls.js
+++ b/src/components/AssignmentTexter/StyleControls.js
@@ -62,7 +62,13 @@ export const flexStyles = StyleSheet.create({
     right: 0,
     display: "flex",
     flexDirection: "column",
-    height: "100%"
+    //messages can be scrolled through and height/width is responsive 
+    height: "100%",
+    "@media(max-width: 420px)": {
+      fontFamily: "Poppins",
+      overflowY: "scroll !important",
+      width: "100%"
+    }
   },
   popoverSideboxesInner: {
     // expand to fill the whole popover
@@ -114,7 +120,12 @@ export const flexStyles = StyleSheet.create({
     height: "100%"
   },
   superSectionMessageBox: {
-    flex: "1 2 auto",
+    "@media(min-height: 300px) and (max-Height: 700px)": {
+      height: "100%",
+    },
+    "@media(min-height: 701px) and (max-Height: 1000px)": {
+      height: "53%",
+    },
     overflowY: "scroll",
     overflow: "-moz-scrollbars-vertical",
     overflowX: "hidden",
@@ -124,6 +135,9 @@ export const flexStyles = StyleSheet.create({
   },
   /// * Section Scrolling Message Thread
   sectionMessageThread: {
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "flex-start",
     flex: "1 1 auto",
     overflowY: "scroll"
   },
@@ -169,19 +183,12 @@ export const flexStyles = StyleSheet.create({
     marginBottom: "8px"
   },
   subSectionMessageFieldTextField: {
-    "@media(max-width: 350px)": {
+    "@media(max-width: 420px)": {
       overflowY: "scroll !important"
     }
   },
   /// * Section Reply/Exit Buttons
   sectionButtons: {
-    // TODO: maybe make this contingent on whether there are answer buttons
-    "@media(max-height: 600px)": {
-      flexBasis: "96px" // TODO
-    },
-    "@media(min-height: 600px)": {
-      flexBasis: "144px" // TODO
-    },
     flexGrow: "0",
     flexShrink: "0",
     // flexBasis: ${130px|190px}", // stretches and shrinks more quickly than message
@@ -197,7 +204,6 @@ export const flexStyles = StyleSheet.create({
     // height:105: webkit needs constraint on height sometimes
     //   during the inflection point of showing the shortcut-buttons
     //   without the height, the exit buttons get pushed down oddly
-    height: "15px", //TODO
     // internal:
     margin: "9px 0px 0px 9px",
     width: "100%"
@@ -244,6 +250,7 @@ export const flexStyles = StyleSheet.create({
   /// * Section Send Button
   sectionSend: {
     //sendButtonWrapper
+    height: "72px",
     flex: `0 0 auto`,
     display: "flex",
     flexDirection: "column",
diff --git a/src/containers/AssignmentTexterContact.jsx b/src/containers/AssignmentTexterContact.jsx
index d364c009f..5f4867a04 100644
--- a/src/containers/AssignmentTexterContact.jsx
+++ b/src/containers/AssignmentTexterContact.jsx
@@ -388,11 +388,20 @@ export class AssignmentTexterContact extends React.Component {
   };
 
   bulkSendMessages = async assignmentId => {
-    await this.props.mutations.bulkSendMessages(assignmentId);
-    this.props.refreshData();
+    return await this.props.mutations.bulkSendMessages(assignmentId);
   };
 
   render() {
+    const texterUIConfig = this.props.campaign.texterUIConfig;
+    const settingsData = JSON.parse(
+      (texterUIConfig && texterUIConfig.options) || "{}"
+    );
+    const campaignAllowBulkSend =
+      texterUIConfig &&
+      texterUIConfig.sideboxChoices &&
+      texterUIConfig.sideboxChoices.includes("per-campaign-bulk-send")
+        ? settingsData["per-campaign-bulk-send"]
+        : true;
     return (
       <div {...dataTest("assignmentTexterContactFirstDiv")}>
         {this.state.disabled &&
@@ -428,13 +437,14 @@ export class AssignmentTexterContact extends React.Component {
           updateContactData={this.props.updateContactData}
         />
         {this.props.contact.messageStatus === "needsMessage" &&
-        window.NOT_IN_USA &&
-        window.ALLOW_SEND_ALL &&
+        this.props.campaign.organization.allowSendAll &&
+        campaignAllowBulkSend &&
         window.BULK_SEND_CHUNK_SIZE ? (
           <BulkSendButton
             assignment={this.props.assignment}
             onFinishContact={this.props.onFinishContact}
             bulkSendMessages={this.bulkSendMessages}
+            refreshData={this.props.refreshData}
             setDisabled={this.setDisabled}
           />
         ) : null}
diff --git a/src/containers/TexterTodoList.jsx b/src/containers/TexterTodoList.jsx
index ef6bda899..d0f058f6e 100644
--- a/src/containers/TexterTodoList.jsx
+++ b/src/containers/TexterTodoList.jsx
@@ -170,6 +170,7 @@ const assignmentQueryData = `
             sideboxChoices
           }
           organization {
+            allowSendAll
             id
           }
         }
diff --git a/src/extensions/action-handlers/ngpvan-action.js b/src/extensions/action-handlers/ngpvan-action.js
index 7a3712d4f..ad08d6ff7 100644
--- a/src/extensions/action-handlers/ngpvan-action.js
+++ b/src/extensions/action-handlers/ngpvan-action.js
@@ -1,4 +1,4 @@
-import { getConfig } from "../../server/api/lib/config";
+import { getConfig, hasConfig } from "../../server/api/lib/config";
 import Van from "../contact-loaders/ngpvan/util";
 import {
   getCountryCode,
@@ -93,7 +93,7 @@ export const postCanvassResponse = async (contact, organization, bodyInput) => {
     retries: 0,
     timeout: Van.getNgpVanTimeout(organization),
     headers: {
-      Authorization: Van.getAuth(organization),
+      Authorization: await Van.getAuth(organization),
       "Content-Type": "application/json"
     },
     body: JSON.stringify(body),
@@ -127,7 +127,7 @@ async function getContactTypeIdAndInputTypeId(organization) {
       method: "GET",
       timeout: Van.getNgpVanTimeout(organization),
       headers: {
-        Authorization: Van.getAuth(organization)
+        Authorization: await Van.getAuth(organization)
       }
     }
   )
@@ -145,7 +145,7 @@ async function getContactTypeIdAndInputTypeId(organization) {
       method: "GET",
       timeout: Van.getNgpVanTimeout(organization),
       headers: {
-        Authorization: Van.getAuth(organization)
+        Authorization: await Van.getAuth(organization)
       }
     }
   )
@@ -228,7 +228,7 @@ export async function getClientChoiceData(organization) {
       method: "GET",
       timeout: Van.getNgpVanTimeout(organization),
       headers: {
-        Authorization: Van.getAuth(organization)
+        Authorization: await Van.getAuth(organization)
       }
     }
   )
@@ -246,7 +246,7 @@ export async function getClientChoiceData(organization) {
       method: "GET",
       timeout: Van.getNgpVanTimeout(organization),
       headers: {
-        Authorization: Van.getAuth(organization)
+        Authorization: await Van.getAuth(organization)
       }
     }
   )
@@ -264,7 +264,7 @@ export async function getClientChoiceData(organization) {
       method: "GET",
       timeout: Van.getNgpVanTimeout(organization),
       headers: {
-        Authorization: Van.getAuth(organization)
+        Authorization: await Van.getAuth(organization)
       }
     }
   )
@@ -371,8 +371,9 @@ export async function getClientChoiceData(organization) {
 // process.env.ACTION_HANDLERS
 export async function available(organization) {
   let result =
-    !!getConfig("NGP_VAN_API_KEY", organization) &&
-    !!getConfig("NGP_VAN_APP_NAME", organization);
+    (hasConfig("NGP_VAN_API_KEY", organization) ||
+      hasConfig("NGP_VAN_API_KEY_ENCRYPTED", organization)) &&
+    hasConfig("NGP_VAN_APP_NAME", organization);
 
   if (!result) {
     // eslint-disable-next-line no-console
diff --git a/src/extensions/contact-loaders/ngpvan/index.js b/src/extensions/contact-loaders/ngpvan/index.js
index 6f2f24d03..02d8df3f9 100644
--- a/src/extensions/contact-loaders/ngpvan/index.js
+++ b/src/extensions/contact-loaders/ngpvan/index.js
@@ -1,5 +1,5 @@
 import { finalizeContactLoad } from "../helpers";
-import { getConfig } from "../../../server/api/lib/config";
+import { getConfig, hasConfig } from "../../../server/api/lib/config";
 import { parseCSVAsync } from "../../../workers/parse_csv";
 import { failedContactLoad } from "../../../workers/jobs";
 import HttpRequest from "../../../server/lib/http-request.js";
@@ -58,9 +58,10 @@ export async function available(organization, user) {
   // / then it's better to allow the result to be cached
 
   const result =
-    !!getConfig("NGP_VAN_API_KEY", organization) &&
-    !!getConfig("NGP_VAN_APP_NAME", organization) &&
-    !!getConfig("NGP_VAN_WEBHOOK_BASE_URL", organization);
+    (hasConfig("NGP_VAN_API_KEY", organization) ||
+      hasConfig("NGP_VAN_API_KEY_ENCRYPTED", organization)) &&
+    hasConfig("NGP_VAN_APP_NAME", organization) &&
+    hasConfig("NGP_VAN_WEBHOOK_BASE_URL", organization);
 
   if (!result) {
     console.log(
@@ -115,7 +116,7 @@ async function requestVanSavedLists(organization, skip) {
   const response = await HttpRequest(url, {
     method: "GET",
     headers: {
-      Authorization: Van.getAuth(organization)
+      Authorization: await Van.getAuth(organization)
     },
     retries: 0,
     timeout: Van.getNgpVanTimeout(organization)
@@ -296,7 +297,7 @@ export async function processContactLoad(job, maxContacts, organization) {
       retries: 0,
       timeout: Van.getNgpVanTimeout(organization),
       headers: {
-        Authorization: Van.getAuth(organization),
+        Authorization: await Van.getAuth(organization),
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
diff --git a/src/extensions/contact-loaders/ngpvan/util.js b/src/extensions/contact-loaders/ngpvan/util.js
index 759e70201..c73cc2c67 100644
--- a/src/extensions/contact-loaders/ngpvan/util.js
+++ b/src/extensions/contact-loaders/ngpvan/util.js
@@ -1,13 +1,19 @@
-import { getConfig } from "../../../server/api/lib/config";
+import {
+  getConfig,
+  getConfigDecrypt,
+  hasConfig
+} from "../../../server/api/lib/config";
 
 export const DEFAULT_NGP_VAN_API_BASE_URL = "https://api.securevan.com";
 export const DEFAULT_NGP_VAN_DATABASE_MODE = 0;
 export const DEFAULT_NGPVAN_TIMEOUT = 32000;
 
 export default class Van {
-  static getAuth = organization => {
+  static getAuth = async organization => {
     const appName = getConfig("NGP_VAN_APP_NAME", organization);
-    const apiKey = getConfig("NGP_VAN_API_KEY", organization);
+    const apiKey = hasConfig("NGP_VAN_API_KEY_ENCRYPTED", organization)
+      ? await getConfigDecrypt("NGP_VAN_API_KEY_ENCRYPTED", organization)
+      : getConfig("NGP_VAN_API_KEY", organization);
     const databaseMode = getConfig("NGP_VAN_DATABASE_MODE", organization);
 
     if (!appName || !apiKey) {
diff --git a/src/extensions/message-handlers/ngpvan/index.js b/src/extensions/message-handlers/ngpvan/index.js
index aec7a037c..7483f314b 100644
--- a/src/extensions/message-handlers/ngpvan/index.js
+++ b/src/extensions/message-handlers/ngpvan/index.js
@@ -1,4 +1,4 @@
-import { getConfig } from "../../../server/api/lib/config";
+import { getConfig, hasConfig } from "../../../server/api/lib/config";
 const Van = require("../../../extensions/action-handlers/ngpvan-action");
 
 import { getActionChoiceData } from "../../../extensions/action-handlers";
@@ -21,8 +21,9 @@ export const serverAdministratorInstructions = () => {
 };
 
 export const available = organization =>
-  !!getConfig("NGP_VAN_API_KEY", organization) &&
-  !!getConfig("NGP_VAN_APP_NAME", organization);
+  (hasConfig("NGP_VAN_API_KEY", organization) ||
+    hasConfig("NGP_VAN_API_KEY_ENCRYPTED", organization)) &&
+  hasConfig("NGP_VAN_APP_NAME", organization);
 
 // export const preMessageSave = async () => {};
 
diff --git a/src/extensions/secret-manager/crypto.js b/src/extensions/secret-manager/crypto.js
index 09f9b1004..512ad4fa3 100644
--- a/src/extensions/secret-manager/crypto.js
+++ b/src/extensions/secret-manager/crypto.js
@@ -6,31 +6,33 @@ Used to encrypt/decrypt values (like auth tokens) before storing them in the
 database, using the SESSION_SECRET environment variable as the encryption key.
 */
 
-const crypto = require("crypto");
+const crypto = require("crypto-browserify");
 
 const secret = process.env.SESSION_SECRET || global.SESSION_SECRET;
 const algorithm = "aes-256-cbc";
 
-if (!secret) {
-  throw new Error(
-    "The SESSION_SECRET environment variable must be set to use crypto functions!"
-  );
-}
-
 // The encryption key must be exactly 32 (bytes). We pad the SESSION_SECRET to
 // 32 characters because in the default development environment it is shorter.
 // In production environments the SESSION_SECRET should be a long random sring.
-if (secret.length < 32) {
+if (secret && secret.length < 32) {
   // eslint-disable-next-line no-console
   console.warn(
     "Using short (insecure) SESSION_SECRET. Fine for testing, bad for production."
   );
 }
-const key = Buffer.concat([Buffer.from(secret)], 32);
+
+const getKey = () => {
+  if (!secret) {
+    throw new Error(
+      "The SESSION_SECRET environment variable must be set to use crypto functions!"
+    );
+  }
+  return Buffer.concat([Buffer.from(secret)], 32);
+};
 
 const symmetricEncrypt = value => {
   const iv = crypto.randomBytes(16);
-  const cipher = crypto.createCipheriv(algorithm, key, iv);
+  const cipher = crypto.createCipheriv(algorithm, getKey(), iv);
   let encrypted = cipher.update(value, "utf8", "buffer");
   encrypted = Buffer.concat([encrypted, cipher.final("buffer")]);
   return iv.toString("hex") + ":" + encrypted.toString("hex");
@@ -40,7 +42,7 @@ const symmetricDecrypt = encrypted => {
   let parts = encrypted.split(":");
   const iv = Buffer.from(parts.shift(), "hex");
   const encryptedValue = Buffer.from(parts.join(":"), "hex");
-  const decipher = crypto.createDecipheriv(algorithm, key, iv);
+  const decipher = crypto.createDecipheriv(algorithm, getKey(), iv);
   let decrypted = decipher.update(encryptedValue, "buffer", "utf8");
   return decrypted + decipher.final("utf8");
 };
diff --git a/src/extensions/secret-manager/default-encrypt/index.js b/src/extensions/secret-manager/default-encrypt/index.js
index a2a95073c..74a2532d5 100644
--- a/src/extensions/secret-manager/default-encrypt/index.js
+++ b/src/extensions/secret-manager/default-encrypt/index.js
@@ -1,7 +1,12 @@
 import { symmetricDecrypt, symmetricEncrypt } from "../crypto";
 
 export async function getSecret(name, token, organization) {
-  return symmetricDecrypt(token);
+  try {
+    return symmetricDecrypt(token);
+  } catch (e) {
+    // Can't decrypt, return value as-is.
+    return token;
+  }
 }
 
 export async function convertSecret(name, organization, secretValue) {
diff --git a/src/extensions/service-managers/ngpvan/index.js b/src/extensions/service-managers/ngpvan/index.js
new file mode 100644
index 000000000..81d673060
--- /dev/null
+++ b/src/extensions/service-managers/ngpvan/index.js
@@ -0,0 +1,61 @@
+import { getFeatures } from "../../../server/api/lib/config";
+import { cacheableData } from "../../../server/models";
+
+export const name = "ngpvan";
+
+export const metadata = () => ({
+  displayName: "NGPVAN Integration",
+  description: "Used to set NGPVAN credentials per-organization",
+  canSpendMoney: false,
+  moneySpendingOperations: [],
+  supportsOrgConfig: true,
+  supportsCampaignConfig: false
+});
+
+export async function getOrganizationData({ organization, user, loaders }) {
+  // MUST NOT RETURN SECRETS!
+  const features = getFeatures(organization);
+  const {
+    NGP_VAN_API_KEY_ENCRYPTED,
+    NGP_VAN_APP_NAME,
+    NGP_VAN_DATABASE_MODE
+  } = features;
+  return {
+    // data is any JSON-able data that you want to send.
+    // This can/should map to the return value if you implement onOrganizationUpdateSignal()
+    // which will then get updated data in the Settings component on-save
+    data: {
+      NGP_VAN_API_KEY_ENCRYPTED: NGP_VAN_API_KEY_ENCRYPTED && "<Encrypted>",
+      NGP_VAN_APP_NAME,
+      NGP_VAN_DATABASE_MODE: String(NGP_VAN_DATABASE_MODE)
+    },
+    // fullyConfigured: null means (more) configuration is optional -- maybe not required to be enabled
+    // fullyConfigured: true means it is fully enabled and configured for operation
+    // fullyConfigured: false means more configuration is REQUIRED (i.e. manager is necessary and needs more configuration for Spoke campaigns to run)
+    fullyConfigured: null
+  };
+}
+
+export async function onOrganizationUpdateSignal({
+  organization,
+  user,
+  updateData
+}) {
+  const updatedFeatures = await cacheableData.organization.setFeatures(
+    organization.id,
+    updateData
+  );
+  const {
+    NGP_VAN_API_KEY_ENCRYPTED,
+    NGP_VAN_APP_NAME,
+    NGP_VAN_DATABASE_MODE
+  } = updatedFeatures;
+  return {
+    data: {
+      NGP_VAN_API_KEY_ENCRYPTED: NGP_VAN_API_KEY_ENCRYPTED && "<Encrypted>",
+      NGP_VAN_APP_NAME,
+      NGP_VAN_DATABASE_MODE: String(NGP_VAN_DATABASE_MODE)
+    },
+    fullyConfigured: true
+  };
+}
diff --git a/src/extensions/service-managers/ngpvan/react-component.js b/src/extensions/service-managers/ngpvan/react-component.js
new file mode 100644
index 000000000..139fe0cc6
--- /dev/null
+++ b/src/extensions/service-managers/ngpvan/react-component.js
@@ -0,0 +1,85 @@
+/* eslint no-console: 0 */
+import PropTypes from "prop-types";
+import React from "react";
+import Form from "react-formal";
+import * as yup from "yup";
+import GSForm from "../../../components/forms/GSForm";
+import GSTextField from "../../../components/forms/GSTextField";
+import GSSelectField from "../../../components/forms/GSSelectField";
+import GSSubmitButton from "../../../components/forms/GSSubmitButton";
+
+export class OrgConfig extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    const formSchema = yup.object({
+      NGP_VAN_API_KEY_ENCRYPTED: yup
+        .string()
+        .max(64)
+        .notRequired()
+        .nullable(),
+      NGP_VAN_APP_NAME: yup
+        .string()
+        .max(32)
+        .notRequired()
+        .nullable(),
+      NGP_VAN_DATABASE_MODE: yup
+        .number()
+        .oneOf([0, 1, null])
+        .nullable()
+        .transform(val => (isNaN(val) ? null : val))
+    });
+    return (
+      <div>
+        <GSForm
+          schema={formSchema}
+          defaultValue={this.props.serviceManagerInfo.data}
+          onSubmit={x => {
+            this.props.onSubmit(x);
+          }}
+        >
+          <Form.Field
+            as={GSTextField}
+            label="NGPVAN API Key"
+            name="NGP_VAN_API_KEY_ENCRYPTED"
+            fullWidth
+          />
+          <Form.Field
+            as={GSTextField}
+            label="NGPVAN App Name"
+            name="NGP_VAN_APP_NAME"
+            fullWidth
+          />
+          <Form.Field
+            as={GSSelectField}
+            label="NGP VAN Database Mode"
+            name="NGP_VAN_DATABASE_MODE"
+            choices={[
+              { value: "", label: "" },
+              { value: "0", label: "My Voters" },
+              { value: "1", label: "My Campaign" }
+            ]}
+            style={{ width: "100%" }}
+          />
+          <Form.Submit
+            as={GSSubmitButton}
+            label="Save"
+            style={this.props.inlineStyles.dialogButton}
+          />
+        </GSForm>
+      </div>
+    );
+  }
+}
+
+OrgConfig.propTypes = {
+  organizationId: PropTypes.string,
+  serviceManagerInfo: PropTypes.object,
+  inlineStyles: PropTypes.object,
+  styles: PropTypes.object,
+  saveLabel: PropTypes.string,
+  onSubmit: PropTypes.func
+};
diff --git a/src/extensions/service-vendors/fakeservice/index.js b/src/extensions/service-vendors/fakeservice/index.js
index b8e76136c..48b5fa9e7 100644
--- a/src/extensions/service-vendors/fakeservice/index.js
+++ b/src/extensions/service-vendors/fakeservice/index.js
@@ -5,7 +5,7 @@ import {
   r,
   cacheableData
 } from "../../../server/models";
-import uuid from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 
 // This 'fakeservice' allows for fake-sending messages
 // that end up just in the db appropriately and then using sendReply() graphql
@@ -141,7 +141,7 @@ export async function buyNumbersInAreaCode(organization, areaCode, limit) {
       area_code: areaCode,
       phone_number: `+1${areaCode}XYZ${last4}`,
       service: "fakeservice",
-      service_id: uuid.v4()
+      service_id: uuidv4()
     });
   }
 
diff --git a/src/extensions/service-vendors/twilio/index.js b/src/extensions/service-vendors/twilio/index.js
index 427a3bda1..82b3745fe 100644
--- a/src/extensions/service-vendors/twilio/index.js
+++ b/src/extensions/service-vendors/twilio/index.js
@@ -4,7 +4,11 @@ import Twilio, { twiml } from "twilio";
 import urlJoin from "url-join";
 import { log } from "../../../lib";
 import { getFormattedPhoneNumber } from "../../../lib/phone-format";
-import { getConfig, hasConfig } from "../../../server/api/lib/config";
+import {
+  getConfig,
+  getConfigDecrypt,
+  hasConfig
+} from "../../../server/api/lib/config";
 import {
   cacheableData,
   Log,
@@ -1040,14 +1044,10 @@ export const getServiceConfig = async (
     if (hasEncryptedToken) {
       authToken = obscureSensitiveInformation
         ? "<Encrypted>"
-        : await getSecret(
+        : await getConfigDecrypt(
             "TWILIO_AUTH_TOKEN_ENCRYPTED",
-            getConfig(
-              "TWILIO_AUTH_TOKEN_ENCRYPTED",
-              organization,
-              getConfigOptions
-            ),
-            organization
+            organization,
+            getConfigOptions
           );
     } else {
       const hasUnencryptedToken = hasConfig(
diff --git a/src/extensions/texter-sideboxes/per-campaign-bulk-send/react-component.js b/src/extensions/texter-sideboxes/per-campaign-bulk-send/react-component.js
new file mode 100644
index 000000000..f983ac09c
--- /dev/null
+++ b/src/extensions/texter-sideboxes/per-campaign-bulk-send/react-component.js
@@ -0,0 +1,56 @@
+import type from "prop-types";
+import React from "react";
+import { withRouter } from "react-router";
+import loadData from "../../../containers/hoc/load-data";
+
+export const displayName = () => "Allow bulk send for this campaign";
+
+export const showSidebox = () => {
+  return true;
+};
+
+export class TexterSideboxClass extends React.Component {
+  gotoInitials = () => {
+    const { campaign, assignment } = this.props;
+    this.props.router.push(
+      `/app/${campaign.organization.id}/todos/${assignment.id}/text`
+    );
+  };
+
+  gotoReplies = () => {
+    const { campaign, assignment } = this.props;
+    this.props.router.push(
+      `/app/${campaign.organization.id}/todos/${assignment.id}/reply`
+    );
+  };
+
+  gotoTodos = () => {
+    const { campaign } = this.props;
+    this.props.router.push(`/app/${campaign.organization.id}/todos`);
+  };
+
+  render() {
+    return null;
+  }
+}
+
+TexterSideboxClass.propTypes = {
+  router: type.object,
+  mutations: type.object,
+
+  // data
+  contact: type.object,
+  campaign: type.object,
+  assignment: type.object,
+  texter: type.object,
+
+  // parent state
+  navigationToolbarChildren: type.object,
+  messageStatusFilter: type.string
+};
+
+export const mutations = {};
+
+export const TexterSidebox = loadData({ mutations })(
+  withRouter(TexterSideboxClass)
+);
diff --git a/src/server/api/lib/config.js b/src/server/api/lib/config.js
index b9f80b988..994be8b0c 100644
--- a/src/server/api/lib/config.js
+++ b/src/server/api/lib/config.js
@@ -1,4 +1,5 @@
 import fs from "fs";
+import { getSecret } from "../../../extensions/secret-manager";
 
 // This is for centrally loading config from different environment sources
 // Especially for large config values (or many) some environments (like AWS Lambda) limit
@@ -60,6 +61,17 @@ export function getConfig(key, organization, opts) {
   return opts && opts.default;
 }
 
+// Ideally, decryption would happen automatically in getConfig(), but because
+// the secret manager is async, getConfig would need to be async as well and a
+// lot of code would need to be updated.
+export async function getConfigDecrypt(key, organization, opts) {
+  let value = getConfig(key, organization, opts);
+  if (key.endsWith("_ENCRYPTED")) {
+    value = await getSecret(key, value, organization);
+  }
+  return value;
+}
+
 export function hasConfig(key, organization, options = {}) {
   const val = exports.getConfig(key, organization, options);
   // we need to allow "" as no config since env vars will occasionally be set to that to undefine it
diff --git a/src/server/api/mutations/bulkSendMessages.js b/src/server/api/mutations/bulkSendMessages.js
index 80438f9f4..8750f2a66 100644
--- a/src/server/api/mutations/bulkSendMessages.js
+++ b/src/server/api/mutations/bulkSendMessages.js
@@ -1,4 +1,5 @@
 import camelCaseKeys from "camelcase-keys";
+import { getContacts } from "../assignment";
 import { GraphQLError } from "graphql/error";
 
 import { getConfig } from "../lib/config";
@@ -41,16 +42,20 @@ export const bulkSendMessages = async (
     { user, loaders }
   );
 
-  const contacts = await r
-    .knex("campaign_contact")
-    .where({
-      message_status: "needsMessage"
-    })
-    .where({
-      assignment_id: assignmentId
-    })
+  const contacts = await getContacts(
+    assignment,
+    {
+      messageStatus: "needsMessage",
+      validTimezone: true,
+      isOptedOut: false
+    },
+    organization,
+    await loaders.campaign.load(assignment.campaign_id),
+    true
+  )
+    .select("*")
     .orderByRaw("updated_at")
-    .limit(process.env.BULK_SEND_CHUNK_SIZE);
+    .limit(process.env.BULK_SEND_BATCH_SIZE);
 
   const interactionSteps = await r
     .knex("interaction_step")
@@ -64,6 +69,11 @@ export const bulkSendMessages = async (
       is_deleted: false
     });
 
+  // No contacts to message
+  if (!contacts.length) {
+    return await Promise.all([]);
+  }
+
   const topmostParent = interactionSteps[0];
 
   const texter = camelCaseKeys(await User.get(assignment.user_id));
diff --git a/src/server/api/mutations/findNewCampaignContact.js b/src/server/api/mutations/findNewCampaignContact.js
index e9b2f5d9d..1c5556597 100644
--- a/src/server/api/mutations/findNewCampaignContact.js
+++ b/src/server/api/mutations/findNewCampaignContact.js
@@ -1,4 +1,5 @@
 import { log } from "../../../lib";
+import { resolvers } from "../campaign";
 import telemetry from "../../telemetry";
 import { r, cacheableData } from "../../models";
 import { assignmentRequiredOrAdminRole } from "../errors";
@@ -131,10 +132,27 @@ export const findNewCampaignContact = async (
       .whereNull("assignment_id");
   }
 
-  // Don't add more if they already have that many
-  const hasCurrent = await r.getCount(hasCurrentQuery);
-  if (hasCurrent >= numberContacts) {
-    return falseRetVal;
+  const texterUIConfig = await resolvers.Campaign.texterUIConfig(
+    campaign,
+    undefined,
+    { user, loaders }
+  );
+  const settingsData = JSON.parse(
+    (texterUIConfig && texterUIConfig.options) || "{}"
+  );
+  const campaignAllowBulkSend =
+    texterUIConfig &&
+    texterUIConfig.sideboxChoices &&
+    texterUIConfig.sideboxChoices.includes("per-campaign-bulk-send")
+      ? settingsData["per-campaign-bulk-send"]
+      : true;
+
+  // Don't add more if they already have that many and bulk send isn't enabled for the campaign
+  if (!campaignAllowBulkSend) {
+    const hasCurrent = await r.getCount(hasCurrentQuery);
+    if (hasCurrent >= numberContacts) {
+      return falseRetVal;
+    }
   }
 
   if (batchQuery.skipLocked && /pg|mysql/.test(r.knex.client.config.client)) {
diff --git a/src/server/api/schema.js b/src/server/api/schema.js
index 9f46a29a6..4d15b33cf 100644
--- a/src/server/api/schema.js
+++ b/src/server/api/schema.js
@@ -665,7 +665,7 @@ const rootMutations = {
 
       const organization = await loaders.organization.load(organizationId);
 
-      const passportStrategy = getConfig("PASSPORT_STRATEGY", organization);
+      const passportStrategy = getConfig("PASSPORT_STRATEGY", organization) || "auth0";
       if (passportStrategy === "auth0") {
         const { email } = await r
           .knex("user")
diff --git a/src/server/middleware/render-index.js b/src/server/middleware/render-index.js
index 7f9f16892..d53cdd473 100644
--- a/src/server/middleware/render-index.js
+++ b/src/server/middleware/render-index.js
@@ -80,6 +80,9 @@ export default function renderIndex(html, css, assetMap) {
         truthy: 1
       }) || false}
       window.BULK_SEND_CHUNK_SIZE=${process.env.BULK_SEND_CHUNK_SIZE || 0}
+      window.BULK_SEND_BATCH_SIZE=${process.env.BULK_SEND_BATCH_SIZE ||
+        process.env.BULK_SEND_CHUNK_SIZE ||
+        0}
       window.MAX_MESSAGE_LENGTH=${process.env.MAX_MESSAGE_LENGTH || 99999}
       window.TERMS_REQUIRE=${getConfig("TERMS_REQUIRE", null, {
         truthy: 1
diff --git a/src/server/models/cacheable_queries/campaign.js b/src/server/models/cacheable_queries/campaign.js
index 8311586ee..4a1623d5d 100644
--- a/src/server/models/cacheable_queries/campaign.js
+++ b/src/server/models/cacheable_queries/campaign.js
@@ -275,7 +275,7 @@ const campaignCache = {
       const campaignDb = await trx("campaign")
         .where("id", id)
         .select("features");
-      const features = getFeatures(campaignDb);
+      const features = getFeatures(campaignDb[0]);
       let changes = false;
       for (const [featureName, featureValue] of Object.entries(newFeatures)) {
         if (features[featureName] !== featureValue) {
diff --git a/src/server/models/cacheable_queries/organization.js b/src/server/models/cacheable_queries/organization.js
index 5a674baed..191843961 100644
--- a/src/server/models/cacheable_queries/organization.js
+++ b/src/server/models/cacheable_queries/organization.js
@@ -2,7 +2,8 @@ import {
   getMessageServiceConfig,
   tryGetFunctionFromService
 } from "../../../extensions/service-vendors/service_map";
-import { getConfig } from "../../api/lib/config";
+import { convertSecret } from "../../../extensions/secret-manager";
+import { getFeatures, getConfig } from "../../api/lib/config";
 import { r } from "../../models";
 
 const cacheKey = orgId => `${process.env.CACHE_PREFIX || ""}org-${orgId}`;
@@ -65,6 +66,66 @@ const organizationCache = {
       }
     }
     return dbResult;
+  },
+  setFeatures: async (id, newFeatures) => {
+    if (!id || !newFeatures) {
+      return;
+    }
+    const features = await r.knex.transaction(async trx => {
+      const orgDb = await trx("organization")
+        .where("id", id)
+        .first("features");
+      const features = getFeatures(orgDb);
+      let changes = false;
+      for (const [featureName, featureValue] of Object.entries(newFeatures)) {
+        if (
+          // Don't save default values that aren't already overridden.
+          (features.hasOwnProperty(featureName) ||
+            getConfig(featureName) !== featureValue) &&
+          // Don't save Encrypted placeholder.
+          featureValue !== "<Encrypted>"
+        ) {
+          features[featureName] = featureValue;
+          // Automatically encrypt token values when needed.
+          if (featureName.endsWith("_ENCRYPTED")) {
+            features[featureName] = await convertSecret(
+              featureName,
+              orgDb,
+              featureValue
+            );
+          }
+          changes = true;
+        }
+      }
+      // Remove feature properties that have been unset
+      Object.keys(newFeatures)
+        .filter(f => newFeatures[f] === "")
+        .forEach(f => {
+          delete features[f];
+          changes = true;
+        });
+      if (changes) {
+        const featuresString = JSON.stringify(features);
+        await trx("organization")
+          .where("id", id)
+          .update("features", featuresString);
+        if (r.redis) {
+          const orgCache = await r.redis.getAsync(cacheKey(id));
+          if (orgCache) {
+            const orgObj = JSON.parse(orgCache);
+            orgObj.feature = features;
+            orgObj.features = featuresString;
+            await r.redis
+              .multi()
+              .set(cacheKey(id), JSON.stringify(orgObj))
+              .expire(cacheKey(id), 10000)
+              .execAsync();
+          }
+        }
+      }
+      return features;
+    });
+    return features;
   }
 };
 
diff --git a/yarn.lock b/yarn.lock
index 79ec71cbf..4bdae6ad2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9880,6 +9880,22 @@ jsonwebtoken@^8.2.0, jsonwebtoken@^8.4.0, jsonwebtoken@^8.5.1:
     ms "^2.1.1"
     semver "^5.6.0"
 
+jsonwebtoken@^9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
+  integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
+  dependencies:
+    jws "^3.2.2"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^7.5.4"
+
 jsprim@^1.2.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
@@ -14177,6 +14193,13 @@ semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -15892,6 +15915,11 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+
 v8-to-istanbul@^8.1.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"