diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d7c79ab7..6669e3a0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ jsoup = "1.17.2"
 jtokkit = "1.0.0"
 junit = "5.10.2"
 kotlin = "1.9.24"
-llm-client = "0.8.2"
+llm-client = "0.8.3"
 okio = "3.9.0"
 tree-sitter = "0.22.5"
 
diff --git a/src/main/java/ee/carlrobert/codegpt/completions/MethodNameLookupListener.java b/src/main/java/ee/carlrobert/codegpt/completions/MethodNameLookupListener.java
index 1b44013c..c95e3055 100644
--- a/src/main/java/ee/carlrobert/codegpt/completions/MethodNameLookupListener.java
+++ b/src/main/java/ee/carlrobert/codegpt/completions/MethodNameLookupListener.java
@@ -10,8 +10,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiUtilCore;
 import ee.carlrobert.codegpt.Icons;
-import ee.carlrobert.codegpt.credentials.CredentialsStore;
-import ee.carlrobert.codegpt.credentials.CredentialsStore.CredentialKey;
 import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings;
 import java.util.Optional;
 import org.jetbrains.annotations.Nullable;
@@ -20,15 +18,13 @@ public class MethodNameLookupListener implements LookupManagerListener {
 
   @Override
   public void activeLookupChanged(@Nullable Lookup oldLookup, @Nullable Lookup newLookup) {
-    var application = ApplicationManager.getApplication();
-    var configuration = ConfigurationSettings.getCurrentState();
-
-    if (!configuration.isMethodNameGenerationEnabled()
-        || !CredentialsStore.INSTANCE.isCredentialSet(CredentialKey.OPENAI_API_KEY)
+    if (!ConfigurationSettings.getCurrentState().isMethodNameGenerationEnabled()
+        || !CompletionRequestService.getInstance().isRequestAllowed()
         || !(newLookup instanceof LookupImpl lookup)) {
       return;
     }
 
+    var application = ApplicationManager.getApplication();
     Optional.ofNullable(lookup.getPsiElement())
         .map(PsiElement::getContext)
         .ifPresent(context ->
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java
index 52930eaf..f94f0f8f 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java
@@ -88,7 +88,7 @@ public class ModelComboBoxAction extends ComboBoxAction {
             OpenAIChatCompletionModel.GPT_4_0125_128k,
             OpenAIChatCompletionModel.GPT_3_5_0125_16k)
         .forEach(model -> actionGroup.add(createOpenAIModelAction(model, presentation)));
-    actionGroup.addSeparator("Custom OpenAI Service");
+    actionGroup.addSeparator("Custom OpenAI");
     actionGroup.add(createModelAction(
         CUSTOM_OPENAI,
         ApplicationManager.getApplication().getService(CustomServiceSettings.class)