diff --git a/api/windows_opengl.C b/api/windows_opengl.C
index 8ee52fc959..1738ce61fb 100755
--- a/api/windows_opengl.C
+++ b/api/windows_opengl.C
@@ -190,18 +190,14 @@ static void set_mode(int mode) {
             }
         }
 
-        hInteractiveWindowStation = OpenWindowStation(
-            graphics_msg.window_station, FALSE, GENERIC_READ | GENERIC_EXECUTE
-        );
+        hInteractiveWindowStation = OpenWindowStation( graphics_msg.window_station, FALSE, GENERIC_READ );
         if (NULL == hInteractiveWindowStation) {
             BOINCTRACE(_T("Failed to retrieve the required window station\n"));
+            new_mode = MODE_UNSUPPORTED;
         } else {
             BOINCTRACE(_T("Retrieved the required window station\n"));
             SetProcessWindowStation(hInteractiveWindowStation);
-            hInteractiveDesktop = OpenDesktop(
-                graphics_msg.desktop, NULL, FALSE,
-                GENERIC_READ | DESKTOP_CREATEWINDOW | DESKTOP_CREATEMENU
-            );
+            hInteractiveDesktop = OpenDesktop( graphics_msg.desktop, NULL, FALSE, GENERIC_READ | DESKTOP_CREATEWINDOW | DESKTOP_CREATEMENU );
             if (NULL == hInteractiveDesktop) {
                 BOINCTRACE(_T("Failed to retrieve the required desktop\n"));
                 new_mode = MODE_UNSUPPORTED;
diff --git a/checkin_notes b/checkin_notes
index a9092e6e6a..649b1554f5 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -19751,6 +19751,9 @@ Rom    17 Nov 2004
     - Bug Fix: Screensaver now works even when BOINC is running as a service.
         NOTE: This currently only works if the account is LocalSystem and
         Interact with Desktop is checked.
+    - Bug Fix: When the service account is switched to an account that cannot
+        support interact with desktop make sure the screensaver can display
+        the project status.
 
     api/
         windows_opengl.C