diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 6d25fc7a17..653183954e 100644
Binary files a/win_build/installerv2/BOINC.ism and b/win_build/installerv2/BOINC.ism differ
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.cpp b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.cpp
index 39514026da..f2e91c95bc 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.cpp
+++ b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.cpp
@@ -492,7 +492,6 @@ UINT BOINCCABase::GetRegistryValue(
 {
 	LONG lReturnValue;
 	HKEY hkSetupHive;
-	DWORD dwType = REG_SZ;
 	DWORD dwSize = 0;
     LPTSTR lpszRegistryValue = NULL;
     tstring strMessage;
@@ -517,7 +516,7 @@ UINT BOINCCABase::GetRegistryValue(
     );
 
     // Allocate the buffer space.
-    lpszRegistryValue = (LPTSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize);
+    lpszRegistryValue = (LPTSTR)HeapAlloc(GetProcessHeap(), NULL, dwSize);
     if ( NULL == lpszRegistryValue ) {
     	RegCloseKey(hkSetupHive);
         return ERROR_INSTALL_FAILURE;
@@ -528,11 +527,14 @@ UINT BOINCCABase::GetRegistryValue(
         hkSetupHive,
         strName.c_str(),
         NULL,
-        &dwType,
+        NULL,
         (LPBYTE)lpszRegistryValue,
         &dwSize
     );
 
+    // Send up the returned value.
+    if (lReturnValue == ERROR_SUCCESS) strValue = tstring(lpszRegistryValue);
+
     // Cleanup
 	RegCloseKey(hkSetupHive);
     HeapFree(GetProcessHeap(), NULL, lpszRegistryValue);
@@ -540,8 +542,6 @@ UINT BOINCCABase::GetRegistryValue(
     // One last check to make sure everything is on the up and up.
     if (lReturnValue != ERROR_SUCCESS) return ERROR_INSTALL_FAILURE;
 
-    // Send up the returned value.
-    strValue = lpszRegistryValue;
 
     strMessage  = _T("Successfully retrieved registry value '") + strName;
     strMessage += _T("' with a value of '");
diff --git a/win_build/installerv2/redist/Windows/x86/boinccas.dll b/win_build/installerv2/redist/Windows/x86/boinccas.dll
index c5f75e5c42..746965c43b 100644
Binary files a/win_build/installerv2/redist/Windows/x86/boinccas.dll and b/win_build/installerv2/redist/Windows/x86/boinccas.dll differ
diff --git a/win_build/installerv2/redist/Windows/x86/boinccas95.dll b/win_build/installerv2/redist/Windows/x86/boinccas95.dll
index c5637d6053..a6feee5307 100644
Binary files a/win_build/installerv2/redist/Windows/x86/boinccas95.dll and b/win_build/installerv2/redist/Windows/x86/boinccas95.dll differ