diff --git a/src/common/m2m-helper.js b/src/common/m2m-helper.js
index 62c51678..e967622f 100644
--- a/src/common/m2m-helper.js
+++ b/src/common/m2m-helper.js
@@ -6,7 +6,9 @@ class M2MHelper {
   static m2m = null;
 
   constructor() {
-    M2MHelper.m2m = m2mAuth(_.pick(config, ["AUTH0_URL", "AUTH0_AUDIENCE", "TOKEN_CACHE_TIME"]));
+    M2MHelper.m2m = m2mAuth(
+      _.pick(config, ["AUTH0_URL", "AUTH0_AUDIENCE", "TOKEN_CACHE_TIME", "AUTH0_PROXY_SERVER_URL"])
+    );
   }
   /**
    * Get M2M token.
diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js
index a125e63d..67fb1372 100644
--- a/src/services/ChallengeService.js
+++ b/src/services/ChallengeService.js
@@ -44,6 +44,7 @@ const {
   convertToISOString,
 } = require("../common/challenge-helper");
 const deepEqual = require("deep-equal");
+const { getM2MToken } = require("../common/m2m-helper");
 
 const challengeDomain = new ChallengeDomain(GRPC_CHALLENGE_SERVER_HOST, GRPC_CHALLENGE_SERVER_PORT);
 const phaseAdvancer = new PhaseAdvancer(challengeDomain);
@@ -1027,6 +1028,7 @@ async function createChallenge(currentUser, challenge, userToken) {
 
   grpcMetadata.set("handle", currentUser.handle);
   grpcMetadata.set("userId", currentUser.userId);
+  grpcMetadata.set("token", await getM2MToken());
 
   convertPrizeSetValuesToCents(challenge.prizeSets);
   const ret = await challengeDomain.create(challenge, grpcMetadata);
@@ -1791,6 +1793,7 @@ async function updateChallenge(currentUser, challengeId, data) {
 
       grpcMetadata.set("handle", currentUser.handle);
       grpcMetadata.set("userId", currentUser.userId);
+      grpcMetadata.set("token", await getM2MToken());
 
       if (updateInput.prizeSetUpdate != null) {
         convertPrizeSetValuesToCents(updateInput.prizeSetUpdate.prizeSets);