2 files changed, 3 insertions, 1 deletions
diff --git a/init.cpp b/init.cpp
index d12472c..62b9d80 100644
--- a/init.cpp
+++ b/init.cpp
@@ -225,6 +225,8 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 
 extern "C" int __declspec(dllexport) Unload(void)
 {
+	for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
+		DBDeleteContactSetting(hContact, szGPGModuleName, "KeyID_Prescense");
 	mir_free(inopentag);
 	mir_free(inclosetag);
 	mir_free(outopentag);
diff --git a/main.cpp b/main.cpp
index 98da48a..bc42087 100644
--- a/main.cpp
+++ b/main.cpp
@@ -415,7 +415,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		TranslateDialogDefault(hwndDlg);
 		DWORD len = MAX_PATH;
 		TCHAR *path = new TCHAR [MAX_PATH];
-		tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", (SHGetValue(HKEY_CURRENT_USER, _T("Software\\GNU\\GnuPG\\gpgProgram"), 0, 0, path, &len) == ERROR_SUCCESS)?path:_T(""));
+		tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", (SHGetValue(HKEY_CURRENT_USER, _T("Software\\GNU\\GnuPG"), _T("gpgProgram"), 0, path, &len) == ERROR_SUCCESS)?path:_T(""));
 		delete [] path;
 		SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
 		mir_free(tmp);