diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90e3e521..8dc82724 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Support for custom OpenAI model configuration
 
+### Fixed
+
+- General Settings isModified state
+
 ## [2.3.0] - 2024-02-14
 
 ### Added
diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/you/YouSettings.java b/src/main/java/ee/carlrobert/codegpt/settings/service/you/YouSettings.java
index a94cec1b..1e45d007 100644
--- a/src/main/java/ee/carlrobert/codegpt/settings/service/you/YouSettings.java
+++ b/src/main/java/ee/carlrobert/codegpt/settings/service/you/YouSettings.java
@@ -35,6 +35,6 @@ public class YouSettings implements PersistentStateComponent<YouSettingsState> {
   public boolean isModified(YouSettingsForm form) {
     var password = YouCredentialManager.getInstance().getCredential();
     return !form.getCurrentState().equals(state)
-        || !StringUtils.equals(form.getPassword(), password);
+        || (!form.getEmail().isEmpty() && !StringUtils.equals(form.getPassword(), password));
   }
 }