diff --git a/src/commands/gemini-chat.ts b/src/commands/gemini-chat.ts
index d591b6d..3dcf736 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: (Environment.USE_NAMES_IN_PROMPT ? `MESSAGE FROM USER "${part.name}":\n` : "") + extractText(part.content, "/gemini")
+                content: (Environment.USE_NAMES_IN_PROMPT && !part.bot ? `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 cc68c6e..f36f3a6 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: (Environment.USE_NAMES_IN_PROMPT ? `MESSAGE FROM USER "${part.name}":\n` : "") + extractText(part.content, Environment.BOT_PREFIX),
+                text: (Environment.USE_NAMES_IN_PROMPT && !part.bot ? `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 89cd018..4b76b85 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: (Environment.USE_NAMES_IN_PROMPT ? `MESSAGE FROM USER "${part.name}":\n` : "") + extractText(part.content, Environment.BOT_PREFIX),
+                content: (Environment.USE_NAMES_IN_PROMPT && !part.bot ? `MESSAGE FROM USER "${part.name}":\n` : "") + extractText(part.content, Environment.BOT_PREFIX),
                 images: imageFilePath && i === 0 ? [imageFilePath] : null
             };
         });