1 files changed, 2 insertions, 16 deletions
diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp
index 57cd4cad41..ea474771a7 100644
--- a/src/modules/protocols/protoaccs.cpp
+++ b/src/modules/protocols/protoaccs.cpp
@@ -549,28 +549,14 @@ void DeactivateAccount(PROTOACCOUNT* pa, bool bIsDynamic, bool bErase)
 
 void EraseAccount(const char* pszModuleName)
 {
-	DBVARIANT dbv;
-	DBCONTACTGETSETTING dbcgs;
-	char szProtoName[32];
-
-	dbcgs.pValue = &dbv;
-	dbcgs.szModule = "Protocol";
-	dbcgs.szSetting = "p";
-
 	// remove protocol contacts first
 	HANDLE hContact = db_find_first();
 	while (hContact != NULL) {
 		HANDLE h1 = hContact;
 		hContact = db_find_next(h1);
 
-		dbv.type = DBVT_ASCIIZ;
-		dbv.pszVal = szProtoName;
-		dbv.cchVal = SIZEOF(szProtoName);
-
-		if (CallService(MS_DB_CONTACT_GETSETTINGSTATIC, (WPARAM)h1, (LPARAM)&dbcgs))
-			continue;
-
-		if (!lstrcmpA(szProtoName, pszModuleName))
+		char *szProto = GetContactProto(hContact);
+		if (szProto != NULL && !lstrcmpA(szProto, pszModuleName))
 			CallService(MS_DB_CONTACT_DELETE, (WPARAM)h1, 0);
 	}