diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index 52e68b42..fe5a5d70 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -674,7 +674,7 @@ BOOL CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara
   if (message == WM_NOTIFY_OUTER_NEXT && wParam == 1)
   {
     // Don't call leave function if fields aren't valid
-    if (!ValidateFields())
+    if (!g_NotifyField && !ValidateFields())
       return 0;
     // Get the settings ready for the leave function verification
     SaveSettings();
@@ -728,7 +728,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
       // Calculate needed size of the control
       DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_SINGLELINE | DT_CALCRECT);
-      
+
       // Move rect to right if in RTL mode
       if (bRTL)
       {
diff --git a/Contrib/InstallOptions/testnotify.ini b/Contrib/InstallOptions/testnotify.ini
index f741b568..3bea95c7 100644
--- a/Contrib/InstallOptions/testnotify.ini
+++ b/Contrib/InstallOptions/testnotify.ini
@@ -72,6 +72,7 @@ Left=10
 Right=-10
 Top=97
 Bottom=118
+MinLen=1
 
 [Field 9]
 Type=Button
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 348a87a6..c5bc7d01 100644
Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ