diff --git a/LLM/language_model.py b/LLM/language_model.py
index 1a957625b43193f936898ea68e4b48d810e86101..ddeb34b1e6895a6ffd77a9f734cb17ad50a1c3a0 100644
--- a/LLM/language_model.py
+++ b/LLM/language_model.py
@@ -115,7 +115,9 @@ class LanguageModelHandler(BaseHandler):
         language_code = None
         if isinstance(prompt, tuple):
             prompt, language_code = prompt
-            prompt = f"Please reply to my message in {WHISPER_LANGUAGE_TO_LLM_LANGUAGE[language_code]}. " + prompt
+            if language_code[-5:] == "-auto":
+                language_code = language_code[:-5]
+                prompt = f"Please reply to my message in {WHISPER_LANGUAGE_TO_LLM_LANGUAGE[language_code]}. " + prompt
 
         self.chat.append({"role": self.user_role, "content": prompt})
         thread = Thread(
diff --git a/LLM/mlx_language_model.py b/LLM/mlx_language_model.py
index 82de10214299d4ebe68200256cec73f22974fd02..87812c53ed9686e4e8cb7c39d657965fb92a950d 100644
--- a/LLM/mlx_language_model.py
+++ b/LLM/mlx_language_model.py
@@ -73,7 +73,9 @@ class MLXLanguageModelHandler(BaseHandler):
 
         if isinstance(prompt, tuple):
             prompt, language_code = prompt
-            prompt = f"Please reply to my message in {WHISPER_LANGUAGE_TO_LLM_LANGUAGE[language_code]}. " + prompt
+            if language_code[-5:] == "-auto":
+                language_code = language_code[:-5]
+                prompt = f"Please reply to my message in {WHISPER_LANGUAGE_TO_LLM_LANGUAGE[language_code]}. " + prompt
 
         self.chat.append({"role": self.user_role, "content": prompt})
 
diff --git a/LLM/openai_api_language_model.py b/LLM/openai_api_language_model.py
index 4614d386b183c4192aeafbb857f2bfad15bf413f..e07b37fbec3a6b92c042435adea6ce77039989d6 100644
--- a/LLM/openai_api_language_model.py
+++ b/LLM/openai_api_language_model.py
@@ -1,13 +1,25 @@
-from openai import OpenAI
-from LLM.chat import Chat
-from baseHandler import BaseHandler
-from rich.console import Console
 import logging
 import time
+
+from nltk import sent_tokenize
+from rich.console import Console
+from openai import OpenAI
+
+from baseHandler import BaseHandler
+from LLM.chat import Chat
+
 logger = logging.getLogger(__name__)
 
 console = Console()
-from nltk import sent_tokenize
+
+WHISPER_LANGUAGE_TO_LLM_LANGUAGE = {
+    "en": "english",
+    "fr": "french",
+    "es": "spanish",
+    "zh": "chinese",
+    "ja": "japanese",
+    "ko": "korean",
+}
 
 class OpenApiModelHandler(BaseHandler):
     """
@@ -61,7 +73,12 @@ class OpenApiModelHandler(BaseHandler):
             language_code = None
             if isinstance(prompt, tuple):
                 prompt, language_code = prompt
+                if language_code[-5:] == "-auto":
+                    language_code = language_code[:-5]
+                    prompt = f"Please reply to my message in {WHISPER_LANGUAGE_TO_LLM_LANGUAGE[language_code]}. " + prompt
 
+            logger.info(prompt)
+            
             response = self.client.chat.completions.create(
                 model=self.model_name,
                 messages=[