1 files changed, 2 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index dd3b39f..6a95b83 100644
--- a/main.cpp
+++ b/main.cpp
@@ -210,7 +210,6 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  dbsetting += "_Password";
 				  DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), passwd);
 			  }
-			  DBWriteContactSettingByte(NULL, szGPGModuleName, "FirstRun", 0);
 			  {
 				  wstring keyinfo = _T("Current private key id: ");
 				  keyinfo += (fp[0])?fp:_T("not set");
@@ -728,6 +727,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			  mir_free(path);
 		  }
 		  gpg_configured = true;
+		  DBWriteContactSettingByte(NULL, szGPGModuleName, "FirstRun", 0);
 		  DestroyWindow(hwndDlg);
 		  ShowFirstRunDialog();
         }
@@ -914,6 +914,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		  }
 		  bAutoExchange = CheckStateStoreDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange");
 		  gpg_configured = true;
+		  DBWriteContactSettingByte(NULL, szGPGModuleName, "FirstRun", 0);
 		  DestroyWindow(hwndDlg);
 		  break;
 	  default: