diff --git a/ChangeLog b/ChangeLog
index 47512dc169..5f9c4b15d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Unreleased Version 2.2.0-pre
  * Fix: Properly update current layer fill source when switching layers.
  * Fix: Cap the number of threads used for parallel processing, because 128 core CPUs exist.
  * Fix: Move back button in login dialog to the left side. Thanks Blozzom for reporting.
+ * Fix: Properly forget password when editing account and unchecking the "remember password" box. Thanks Meru for reporting.
 
 2023-12-08 Version 2.2.0-beta.11
  * Server Fix: No longer show "cannot look up one session and then join another" when joining a session with an ID alias. Thanks Kink and Fabian for finding this.
diff --git a/src/desktop/utils/accountlistmodel.cpp b/src/desktop/utils/accountlistmodel.cpp
index e121eec844..74ec5958b8 100644
--- a/src/desktop/utils/accountlistmodel.cpp
+++ b/src/desktop/utils/accountlistmodel.cpp
@@ -165,7 +165,9 @@ void AccountListModel::saveAccount(
 		return;
 	}
 
-	if(!password.isEmpty()) {
+	if(password.isEmpty()) {
+		deletePassword(buildKeychainSecretName(type, host, username));
+	} else {
 		savePassword(
 			password, buildKeychainSecretName(type, host, username),
 			insecureFallback);