diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index b1e90ed3..154165d6 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -1306,7 +1306,7 @@ void WINAPI showCfgDlg()
   int i = nNumFields;
   while (i--) {
     FieldType *pField = pFields + i;
-    
+
     int j = FIELD_BUFFERS;
     while (j--)
       FREE(((char **) pField)[j]);
@@ -1334,9 +1334,8 @@ extern "C" void __declspec(dllexport) dialog(HWND hwndParent, int string_size,
     pushstring("error");
     return;
   }
-  if (createCfgDlg()) {
+  if (createCfgDlg())
     return;
-  }
   popstring(NULL);
   showCfgDlg();
 }
@@ -1350,8 +1349,9 @@ extern "C" void __declspec(dllexport) initDialog(HWND hwndParent, int string_siz
     pushstring("error");
     return;
   }
+  if (createCfgDlg())
+    return;
   initCalled++;
-  createCfgDlg();
 }
 
 extern "C" void __declspec(dllexport) show(HWND hwndParent, int string_size,
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index dd0de3bd..d99b14d4 100644
Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ