diff --git a/src/extract.js b/src/extract.js
index f4602ba..bb1ab41 100644
--- a/src/extract.js
+++ b/src/extract.js
@@ -42,3 +42,8 @@ export const extractTrackingData = async function (t) {
     description: stripStoryPointsAndTaskToken(card.name),
   };
 };
+
+export const extractTokenName = async function (t) {
+  const board = await t.board("idOrganization");
+  return ["togglToken", board.idOrganization].join("_");
+};
diff --git a/src/settings.js b/src/settings.js
index d31ac9f..fb09cb9 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,12 +1,17 @@
+import { extractTokenName } from "./extract.js";
+
 const t = TrelloPowerUp.iframe();
 
-window.trektorSettings.addEventListener("submit", function (event) {
+window.trektorSettings.addEventListener("submit", (event) => {
   event.preventDefault();
-  return t.storeSecret("togglToken", window.togglToken.value).then(() => {
-    t.closePopup();
+
+  return extractTokenName(t).then((tokenName) => {
+    t.storeSecret(tokenName, window.togglToken.value).then(() => {
+      t.closePopup();
+    });
   });
 });
 
-t.render(function () {
+t.render(() => {
   t.sizeTo(document.body).done();
 });
diff --git a/src/trello.js b/src/trello.js
index b7a5878..82193a9 100644
--- a/src/trello.js
+++ b/src/trello.js
@@ -1,5 +1,5 @@
 import { TogglGateway, TogglService } from "./toggl.js";
-import { extractTrackingData } from "./extract.js";
+import { extractTokenName, extractTrackingData } from "./extract.js";
 
 const withErrorMessage = async function (t, fnc) {
   try {
@@ -15,7 +15,7 @@ const setTrackingData = async function (t, tracking) {
 };
 
 const track = async function (t) {
-  const token = await t.loadSecret("togglToken");
+  const token = await t.loadSecret(await extractTokenName(t));
   if (token === null) {
     throw new Error("Toggl API Token not configured");
   }