diff --git a/checkin_notes b/checkin_notes
index 16b5ab443b..59e92a0ac8 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -23933,6 +23933,9 @@ Rom    3 Feb 2005
         to be consistent with the rest of the tabs.
     - Bug Fix: Additional check to see if any new messages have been added
         before changing the visible messages in the message tab.
+    - Bug Fix: Change the default blank time to 5 minutes.
+    - Bug Fix: Remove the ability for us to affect the secure password
+        option on NT based machines.
 
     client/win/
         win_screensaver.cpp, .h
@@ -23940,3 +23943,5 @@ Rom    3 Feb 2005
         ViewWork.cpp
         ViewTransfers.cpp
         ViewMessages.cpp
+    win_build/installerv2/
+        BOINC.ism
diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp
index 9d13cd539d..10aacc4d04 100755
--- a/client/win/win_screensaver.cpp
+++ b/client/win/win_screensaver.cpp
@@ -177,12 +177,16 @@ HRESULT CScreensaver::Create( HINSTANCE hInstance )
 	// make sure you check return value of registry queries
 	// in case the item in question doesn't happen to exist.
 	bReturnValue = UtilGetRegKey( REG_BLANK_TIME, m_dwBlankTime );
-	if ( bReturnValue < 0 ) m_dwBlankTime = 0;
+	if ( bReturnValue != 0 ) m_dwBlankTime = 5;
 
     // Calculate the estimated blank time by adding the current time
     //   and and the user specified time which is in minutes
     m_dwBlankTime = time(0) + (m_dwBlankTime * 60);
 
+    // Save the value back to the registry in case this is the first
+    // execution and so we need the default value later.
+	UtilSetRegKey( REG_BLANK_TIME, blank_time );
+
 
     // Create the screen saver window(s)
     if( m_SaverMode == sm_preview || 
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 5395f4e3ab..606af9cb0f 100644
Binary files a/win_build/installerv2/BOINC.ism and b/win_build/installerv2/BOINC.ism differ