diff --git a/modules/autoop.cpp b/modules/autoop.cpp
index c29c527f..188c4d63 100644
--- a/modules/autoop.cpp
+++ b/modules/autoop.cpp
@@ -143,6 +143,11 @@ public:
 	}
 
 	virtual ~CAutoOpMod() {
+		for (map<CString, CAutoOpUser*>::iterator it = m_msUsers.begin(); it != m_msUsers.end(); it++) {
+			delete it->second;
+		}
+
+		m_msUsers.clear();
 	}
 
 	virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) {