diff --git a/pages/api/account/tokenManager.js b/pages/api/account/tokenManager.js
index 21b2494..3843d53 100644
--- a/pages/api/account/tokenManager.js
+++ b/pages/api/account/tokenManager.js
@@ -122,12 +122,14 @@ export default async function handler(req, res) {
       } else {
         //Send the token list without tokens
         res.status(200).json([
-          ...usersList[userIndex].tokens.map((token) => ({
-            name: token.name,
-            creation: token.creation,
-            expiration: token.expiration,
-            permissions: token.permissions,
-          })),
+          ...(usersList[userIndex].tokens && Array.isArray(usersList[userIndex].tokens)
+            ? usersList[userIndex].tokens.map((token) => ({
+                name: token.name,
+                creation: token.creation,
+                expiration: token.expiration,
+                permissions: token.permissions,
+              }))
+            : []),
         ]);
         return;
       }
diff --git a/pages/api/repo/add.js b/pages/api/repo/add.js
index 0a0b973..04f8405 100644
--- a/pages/api/repo/add.js
+++ b/pages/api/repo/add.js
@@ -116,7 +116,7 @@ export default async function handler(req, res) {
       await fs.writeFile(jsonDirectory + '/repo.json', newRepoList, (err) => {
         if (err) console.log(err);
       });
-      res.status(200).json({ message: 'Envoi API réussi' });
+      res.status(200).json({ message: 'success' });
     } catch (error) {
       //Log for backend
       console.log(error);
diff --git a/pages/api/repo/id/[slug]/delete.js b/pages/api/repo/id/[slug]/delete.js
index e5c9f11..fa6388d 100644
--- a/pages/api/repo/id/[slug]/delete.js
+++ b/pages/api/repo/id/[slug]/delete.js
@@ -93,7 +93,7 @@ export default async function handler(req, res) {
         if (err) console.log(err);
       });
 
-      res.status(200).json({ message: 'Envoi API réussi' });
+      res.status(200).json({ message: 'success' });
     } catch (error) {
       //Log for backend
       console.log(error);
diff --git a/pages/api/repo/id/[slug]/edit.js b/pages/api/repo/id/[slug]/edit.js
index 1f643ca..e95ceed 100644
--- a/pages/api/repo/id/[slug]/edit.js
+++ b/pages/api/repo/id/[slug]/edit.js
@@ -110,7 +110,7 @@ export default async function handler(req, res) {
         if (err) console.log(err);
       });
 
-      res.status(200).json({ message: 'Envoi API réussi' });
+      res.status(200).json({ message: 'success' });
     } catch (error) {
       //Log for backend
       console.log(error);