diff --git a/ConfigurationManager.cpp b/ConfigurationManager.cpp
index 90a3b72..2862d97 100644
--- a/ConfigurationManager.cpp
+++ b/ConfigurationManager.cpp
@@ -36,6 +36,7 @@ void ConfigurationManager::init()
 {
     setupConnections();
     updateAllTemplateDescriptions();
+    checkAllTemplate();
 }
 
 void ConfigurationManager::updateTemplateDescription(const Utils::StringAspect &templateAspect)
@@ -59,6 +60,26 @@ void ConfigurationManager::updateAllTemplateDescriptions()
     updateTemplateDescription(m_generalSettings.caTemplate);
 }
 
+void ConfigurationManager::checkTemplate(const Utils::StringAspect &templateAspect)
+{
+    LLMCore::PromptTemplate *templ = m_templateManger.getFimTemplateByName(templateAspect.value());
+
+    if (templ->name() == templateAspect.value())
+        return;
+
+    if (&templateAspect == &m_generalSettings.ccTemplate) {
+        m_generalSettings.ccTemplate.setValue(templ->name());
+    } else if (&templateAspect == &m_generalSettings.caTemplate) {
+        m_generalSettings.caTemplate.setValue(templ->name());
+    }
+}
+
+void ConfigurationManager::checkAllTemplate()
+{
+    checkTemplate(m_generalSettings.ccTemplate);
+    checkTemplate(m_generalSettings.caTemplate);
+}
+
 ConfigurationManager::ConfigurationManager(QObject *parent)
     : QObject(parent)
     , m_generalSettings(Settings::generalSettings())
diff --git a/ConfigurationManager.hpp b/ConfigurationManager.hpp
index 5f668e5..2a009cf 100644
--- a/ConfigurationManager.hpp
+++ b/ConfigurationManager.hpp
@@ -38,6 +38,8 @@ class ConfigurationManager : public QObject
 
     void updateTemplateDescription(const Utils::StringAspect &templateAspect);
     void updateAllTemplateDescriptions();
+    void checkTemplate(const Utils::StringAspect &templateAspect);
+    void checkAllTemplate();
 
 public slots:
     void selectProvider();
diff --git a/settings/GeneralSettings.cpp b/settings/GeneralSettings.cpp
index 4a2ff93..17bcfb6 100644
--- a/settings/GeneralSettings.cpp
+++ b/settings/GeneralSettings.cpp
@@ -94,7 +94,7 @@ GeneralSettings::GeneralSettings()
     ccModel.setHistoryCompleter(Constants::CC_MODEL_HISTORY);
     ccSelectModel.m_buttonText = TrConstants::SELECT;
 
-    initStringAspect(ccTemplate, Constants::CC_TEMPLATE, TrConstants::TEMPLATE, "Ollama Auto FIM");
+    initStringAspect(ccTemplate, Constants::CC_TEMPLATE, TrConstants::TEMPLATE, "Ollama FIM");
     ccTemplate.setReadOnly(true);
     ccSelectTemplate.m_buttonText = TrConstants::SELECT;
 
@@ -140,7 +140,7 @@ GeneralSettings::GeneralSettings()
     ccPreset1SelectModel.m_buttonText = TrConstants::SELECT;
 
     initStringAspect(
-        ccPreset1Template, Constants::CC_PRESET1_TEMPLATE, TrConstants::TEMPLATE, "Ollama Auto FIM");
+        ccPreset1Template, Constants::CC_PRESET1_TEMPLATE, TrConstants::TEMPLATE, "Ollama FIM");
     ccPreset1Template.setReadOnly(true);
     ccPreset1SelectTemplate.m_buttonText = TrConstants::SELECT;
 
@@ -153,7 +153,7 @@ GeneralSettings::GeneralSettings()
     caModel.setHistoryCompleter(Constants::CA_MODEL_HISTORY);
     caSelectModel.m_buttonText = TrConstants::SELECT;
 
-    initStringAspect(caTemplate, Constants::CA_TEMPLATE, TrConstants::TEMPLATE, "Ollama Auto Chat");
+    initStringAspect(caTemplate, Constants::CA_TEMPLATE, TrConstants::TEMPLATE, "Ollama Chat");
     caTemplate.setReadOnly(true);
 
     caSelectTemplate.m_buttonText = TrConstants::SELECT;