diff --git a/win_build/installerv2/redist/Windows/Win32/boinccas.dll b/win_build/installerv2/redist/Windows/Win32/boinccas.dll
index 00cc32f68c..389a292ba5 100644
Binary files a/win_build/installerv2/redist/Windows/Win32/boinccas.dll and b/win_build/installerv2/redist/Windows/Win32/boinccas.dll differ
diff --git a/win_build/installerv2/redist/Windows/Win32/boinccas95.dll b/win_build/installerv2/redist/Windows/Win32/boinccas95.dll
index 45d44aed70..288b430b38 100644
Binary files a/win_build/installerv2/redist/Windows/Win32/boinccas95.dll and b/win_build/installerv2/redist/Windows/Win32/boinccas95.dll differ
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CARestoreSetupState.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CARestoreSetupState.cpp
index 483bf03c93..f881d1bb22 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/CARestoreSetupState.cpp
+++ b/win_build/installerv2/redist/Windows/src/boinccas/CARestoreSetupState.cpp
@@ -109,7 +109,7 @@ UINT CARestoreSetupState::OnExecution()
         }
 
         if (strOverrideLaunchProgram.empty()) {
-            if (_T("1") == strLaunchProgram) {
+            if ((_T("1") == strLaunchProgram) || (strLaunchProgram.size() == 0)) {
                 SetProperty( _T("LAUNCHPROGRAM"), _T("1") );
             } else {
                 SetProperty( _T("LAUNCHPROGRAM"), _T("") );
@@ -148,7 +148,7 @@ UINT CARestoreSetupState::OnExecution()
             SetProperty( _T("ENABLEPROTECTEDAPPLICATIONEXECUTION3"), strOverrideEnableProtectedApplicationExecution );
         }
 
-        if (strEnableUseByAllUsers.empty()) {
+        if (strOverrideEnableUseByAllUsers.empty()) {
             if (_T("1") == strEnableUseByAllUsers) {
                 SetProperty( _T("ENABLEUSEBYALLUSERS"), _T("1") );
             } else {
diff --git a/win_build/installerv2/redist/Windows/x64/boinccas.dll b/win_build/installerv2/redist/Windows/x64/boinccas.dll
index 5a0f1c77c9..acf96f4695 100644
Binary files a/win_build/installerv2/redist/Windows/x64/boinccas.dll and b/win_build/installerv2/redist/Windows/x64/boinccas.dll differ
diff --git a/win_build/installerv2/redist/Windows/x64/boinccas95.dll b/win_build/installerv2/redist/Windows/x64/boinccas95.dll
index f9ae4f222e..d01bec6c14 100644
Binary files a/win_build/installerv2/redist/Windows/x64/boinccas95.dll and b/win_build/installerv2/redist/Windows/x64/boinccas95.dll differ