diff --git a/src/commands/gemini-chat.ts b/src/commands/gemini-chat.ts
index ab8d586..d591b6d 100644
--- a/src/commands/gemini-chat.ts
+++ b/src/commands/gemini-chat.ts
@@ -40,7 +40,7 @@ export class GeminiChat extends ChatCommand {
         const chatMessages = messageParts.map(part => {
             return {
                 role: part.bot ? "assistant" : "user",
-                content: `MESSAGE FROM USER "${part.name}":\n` + extractText(part.content, "/gemini")
+                content: (Environment.USE_NAMES_IN_PROMPT ? `MESSAGE FROM USER "${part.name}":\n` : "") + extractText(part.content, "/gemini")
             };
         });
         chatMessages.reverse();
diff --git a/src/commands/mistral-chat.ts b/src/commands/mistral-chat.ts
index fac48b0..cc68c6e 100644
--- a/src/commands/mistral-chat.ts
+++ b/src/commands/mistral-chat.ts
@@ -69,7 +69,7 @@ export class MistralChat extends ChatCommand {
             const content = [];
             content.push({
                 type: "text",
-                text: `MESSAGE FROM USER "${part.name}":\n` + extractText(part.content, Environment.BOT_PREFIX),
+                text: (Environment.USE_NAMES_IN_PROMPT ? `MESSAGE FROM USER "${part.name}":\n` : "") + extractText(part.content, Environment.BOT_PREFIX),
             });
 
             if (imageFilePath && i === 0) {
diff --git a/src/commands/ollama-chat.ts b/src/commands/ollama-chat.ts
index 6a47de7..89cd018 100644
--- a/src/commands/ollama-chat.ts
+++ b/src/commands/ollama-chat.ts
@@ -63,7 +63,7 @@ export class OllamaChat extends ChatCommand {
         const chatMessages = messageParts.map((part, i) => {
             return {
                 role: part.bot ? "assistant" : "user",
-                content: `MESSAGE FROM USER "${part.name}":\n` + extractText(part.content, Environment.BOT_PREFIX),
+                content: (Environment.USE_NAMES_IN_PROMPT ? `MESSAGE FROM USER "${part.name}":\n` : "") + extractText(part.content, Environment.BOT_PREFIX),
                 images: imageFilePath && i === 0 ? [imageFilePath] : null
             };
         });
diff --git a/src/common/environment.ts b/src/common/environment.ts
index 5c88c77..8791f37 100644
--- a/src/common/environment.ts
+++ b/src/common/environment.ts
@@ -17,6 +17,8 @@ export class Environment {
     static USE_DAD: boolean;
     static USE_FU: boolean;
 
+    static USE_NAMES_IN_PROMPT: boolean;
+
     static OLLAMA_MODEL?: string;
     static OLLAMA_ADDRESS?: string;
     static OLLAMA_API_KEY?: string;
@@ -43,6 +45,8 @@ export class Environment {
         Environment.USE_DAD = process.env.USE_DAD == "true";
         Environment.USE_FU = process.env.USE_FU == "true";
 
+        Environment.USE_NAMES_IN_PROMPT = process.env.USE_NAMES_IN_PROMPT == "true";
+
         Environment.OLLAMA_MODEL = process.env.OLLAMA_MODEL;
         Environment.OLLAMA_ADDRESS = process.env.OLLAMA_ADDRESS;
         Environment.OLLAMA_API_KEY = process.env.OLLAMA_API_KEY;