diff --git a/checkin_notes b/checkin_notes
index 7ba8842d97..613c0ad916 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -23967,3 +23967,10 @@ Rom    3 Feb 2005
 
     win_build/installerv2/
         BOINC.ism
+
+Rom    3 Feb 2005
+    - Bug Fix: Add the 'Users' group to the list of users permissioned to read
+        and execute from within the BOINC folder after a service install.
+
+    win_build/installerv2/
+        BOINC.ism
diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp
index e6389615ac..51b5353b6f 100755
--- a/client/win/win_screensaver.cpp
+++ b/client/win/win_screensaver.cpp
@@ -17,15 +17,6 @@
 // or write to the Free Software Foundation, Inc.,
 // 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#ifdef _DEBUG
-
-#define WINVER         0x0502
-#define _WIN32_WINNT   0x0502
-#define _WIN32_WINDOWS 0x0502
-#define _WIN32_IE      0x0502
-
-#endif
-
 #include "boinc_win.h"
 
 #include <windowsx.h>
@@ -773,23 +764,7 @@ LRESULT CScreensaver::PrimarySaverProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPA
                     int  iReturnValue = 0;
                     int  iStatus = 0;
 
-#ifdef _DEBUG
-                    DWORD dwHandleCount = 0;
-                    DWORD dwGDIObjectCount = 0;
-                    DWORD dwUserObjectCount = 0;
 
-                    GetProcessHandleCount(GetCurrentProcess(), &dwHandleCount);
-                    dwGDIObjectCount = GetGuiResources(GetCurrentProcess(), GR_GDIOBJECTS);
-                    dwUserObjectCount = GetGuiResources(GetCurrentProcess(), GR_USEROBJECTS);
-
-                    // Detect a handle leak if any exist
-                    BOINCTRACE(
-                        _T("CScreensaver::PrimarySaverProc - Handle Count = '%d', GDI Objects = '%d', User Objects = '%d'\n"),
-                        dwHandleCount,
-                        dwGDIObjectCount,
-                        dwUserObjectCount
-                    );
-#endif
 			        // Create a screen saver window on the primary display if the boinc client crashes
 			        CreateSaverWindow();
 
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 0ca722e18e..c4758a9a1f 100644
Binary files a/win_build/installerv2/BOINC.ism and b/win_build/installerv2/BOINC.ism differ