diff --git a/checkin_notes b/checkin_notes
index 5b2f29f654..ed13fb3269 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4520,3 +4520,21 @@ Eric	May 28 2008
             Makefile.am  moved to clientgui/res
             boincmgr.{16x16,32x32,48x48}.png  moved to clientgui/res
 
+Rom    May 28 2008
+    - WINSETUP: Fix a struct alignment issue when dumping the base64 encoded
+        password for boinc_project to a file.
+        
+        ATL's string conversion functions act of a class and not a buffer
+        which makes memory management easier but doesn't interop well with
+        fprintf unless you specify the buffer name directly.
+        
+    win_build/installerv2/
+        BOINC.ism
+    win_build/installerv2/redist/Windows/src/boinccas/
+        CACreateClientAuthFile.cpp
+    win_build/installerv2/redist/Windows/Win32/
+        boinccas.dll
+        boinccas95.dll
+    win_build/installerv2/redist/Windows/x64/
+        boinccas.dll
+        boinccas95.dll
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 8ccebcc300..7f19b17b20 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/Win32/boinccas.dll b/win_build/installerv2/redist/Windows/Win32/boinccas.dll
index 3ed8eb5cb6..dfaf76cf7e 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 5abbb45878..7cfd9a36a4 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/CACreateClientAuthFile.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CACreateClientAuthFile.cpp
index dd681fa7ef..ebc8004885 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/CACreateClientAuthFile.cpp
+++ b/win_build/installerv2/redist/Windows/src/boinccas/CACreateClientAuthFile.cpp
@@ -68,6 +68,7 @@ UINT CACreateClientAuthFile::OnExecution()
     tstring          strClientAuthFile;
     tstring          strVersionNT;
     struct _stat     buf;
+    TCHAR                   szMessage[2048];
     UINT             uiReturnValue = -1;
 
 
@@ -135,7 +136,6 @@ UINT CACreateClientAuthFile::OnExecution()
         // We are installing in protected mode, which means the 'boinc_project'
         //   account password has been changed, so we need to write out the new
         //   username and password to the client_auth.xml file.
-        FILE* fClientAuthFile = NULL;
         DWORD dwSize = Base64EncodeGetRequiredLength((int)strBOINCProjectAccountPassword.length());
         LPSTR szBuffer = (LPSTR)malloc(dwSize*sizeof(TCHAR));
         if (!szBuffer)
@@ -177,7 +177,22 @@ UINT CACreateClientAuthFile::OnExecution()
 		}
         CA2W pszUnicodeEncodedPassword( szBuffer );
 
+        _sntprintf(
+            szMessage, 
+            sizeof(szMessage),
+            _T("(Unicode) Base64 Encoded String: '%s'"),
+            pszUnicodeEncodedPassword.m_psz
+        );
+        LogMessage(
+            INSTALLMESSAGE_INFO,
+            NULL, 
+            NULL,
+            NULL,
+            NULL,
+            szMessage
+        );
 
+        FILE* fClientAuthFile = NULL;
         fClientAuthFile = _tfopen(strClientAuthFile.c_str(), _T("w"));
         
         _ftprintf(
@@ -189,7 +204,7 @@ UINT CACreateClientAuthFile::OnExecution()
             _T("    </boinc_project>\n")
             _T("</client_authorization>\n"),
             strBOINCProjectAccountUsername.c_str(),
-            pszUnicodeEncodedPassword
+            pszUnicodeEncodedPassword.m_psz
         );
 
         fclose(fClientAuthFile);
diff --git a/win_build/installerv2/redist/Windows/x64/boinccas.dll b/win_build/installerv2/redist/Windows/x64/boinccas.dll
index 6e2fd00190..f79c407813 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 6fd8c06e12..2fb586b0e1 100644
Binary files a/win_build/installerv2/redist/Windows/x64/boinccas95.dll and b/win_build/installerv2/redist/Windows/x64/boinccas95.dll differ