diff --git a/src/servers/mail/MailDaemon.cpp b/src/servers/mail/MailDaemon.cpp
index d0c4567109..d1d3537415 100644
--- a/src/servers/mail/MailDaemon.cpp
+++ b/src/servers/mail/MailDaemon.cpp
@@ -725,6 +725,7 @@ MailDaemonApp::_RemoveAccount(AccountMap::const_iterator it)
 	delete it->second.outboundProtocol;
 	unload_add_on(it->second.inboundImage);
 	unload_add_on(it->second.outboundImage);
+	fAccounts.erase(it->first);
 }