diff --git a/reactos/base/system/winlogon/screensaver.c b/reactos/base/system/winlogon/screensaver.c
index 4285d75675b..ba3e8d04f2a 100644
--- a/reactos/base/system/winlogon/screensaver.c
+++ b/reactos/base/system/winlogon/screensaver.c
@@ -240,7 +240,7 @@ VOID
 StartScreenSaver(
 	IN PWLSESSION Session)
 {
-	HKEY hKey = NULL;
+	HKEY hKey = NULL, hCurrentUser = NULL;
 	WCHAR szApplicationName[MAX_PATH];
 	WCHAR szCommandLine[MAX_PATH + 3];
 	DWORD bufferSize = sizeof(szApplicationName) - sizeof(WCHAR);
@@ -258,8 +258,17 @@ StartScreenSaver(
 		goto cleanup;
 	}
 
+	rc = RegOpenCurrentUser(
+		KEY_READ,
+		&hCurrentUser);
+	if (rc != ERROR_SUCCESS)
+	{
+		ERR("WL: RegOpenCurrentUser Error!\n");
+		goto cleanup;
+	}
+
 	rc = RegOpenKeyExW(
-		HKEY_CURRENT_USER,
+		hCurrentUser,
 		L"Control Panel\\Desktop",
 		0,
 		KEY_QUERY_VALUE,
@@ -343,6 +352,8 @@ cleanup:
 	RevertToSelf();
 	if (hKey)
 		RegCloseKey(hKey);
+	if (hCurrentUser)
+		RegCloseKey(hCurrentUser);
 	if (!ret)
 	{
 		PostMessageW(Session->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_SCRNSVR_ACTIVITY, 0);
diff --git a/reactos/dll/cpl/desk/screensaver.c b/reactos/dll/cpl/desk/screensaver.c
index deeeda6ec73..4908514166a 100644
--- a/reactos/dll/cpl/desk/screensaver.c
+++ b/reactos/dll/cpl/desk/screensaver.c
@@ -460,6 +460,7 @@ static VOID
 SetScreenSaver(HWND hwndDlg, PDATA pData)
 {
     HKEY regKey;
+    BOOL DeleteMode = FALSE;
 
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
                      _T("Control Panel\\Desktop"),
@@ -486,6 +487,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
         {
             /* Windows deletes the value if no screensaver is set */
             RegDeleteValue(regKey, _T("SCRNSAVE.EXE"));
+            DeleteMode = TRUE;
         }
 
         /* set the screensaver time delay */
@@ -506,6 +508,10 @@ SetScreenSaver(HWND hwndDlg, PDATA pData)
                       (PBYTE)szTime,
                       _tcslen(szTime) * sizeof(TCHAR));
 
+        if (DeleteMode) Time = 0;
+
+        SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE);
+
         /* set the secure value */
         Ret = SendDlgItemMessage(hwndDlg,
                                  IDC_SCREENS_USEPASSCHK,
diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c
index 68f22f34553..48b06297255 100644
--- a/reactos/subsystems/win32/win32k/ntuser/input.c
+++ b/reactos/subsystems/win32/win32k/ntuser/input.c
@@ -75,14 +75,15 @@ DWORD IntLastInputTick(BOOL LastInputTickSetGet)
 VOID FASTCALL DoTheScreenSaver(VOID)
 {
    LARGE_INTEGER TickCount;
-   DWORD Test;
+   DWORD Test, TO;
 
    if (gspv.iScrSaverTimeout > 0) // Zero means Off.
    {
       KeQueryTickCount(&TickCount);
       Test = MsqCalculateMessageTime(&TickCount);
       Test = Test - LastInputTick;
-      if (Test > gspv.iScrSaverTimeout)
+      TO = 1000 * gspv.iScrSaverTimeout;
+      if (Test > TO)
       {
          DPRINT("Screensaver Message Start! Tick %d Timeout %d \n", Test, gspv.iScrSaverTimeout);
 
diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
index 72a9292502b..440abb29162 100644
--- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c
+++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
@@ -59,6 +59,7 @@ static const WCHAR* VAL_HOVERHEIGHT = L"MouseHoverHeight";
 
 static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop";
 static const WCHAR* VAL_SCRTO = L"ScreenSaveTimeOut";
+static const WCHAR* VAL_SCRNSV = L"SCRNSAVE.EXE";
 static const WCHAR* VAL_SCRACT = L"ScreenSaveActive";
 static const WCHAR* VAL_GRID = L"GridGranularity";
 static const WCHAR* VAL_DRAG = L"DragFullWindows";
@@ -136,6 +137,20 @@ SpiLoadUserPrefMask(DWORD dValue)
     return Result;
 }
 
+static
+DWORD
+SpiLoadTimeOut(VOID)
+{   // Must have the string!
+    WCHAR szApplicationName[MAX_PATH];
+    RtlZeroMemory(&szApplicationName, sizeof(szApplicationName));
+    if (!RegReadUserSetting(KEY_DESKTOP, VAL_SCRNSV, REG_SZ, &szApplicationName, sizeof(szApplicationName)))
+    {
+        return 0;
+    }
+    if (wcslen(szApplicationName) == 0) return 0;
+    return SpiLoadInt(KEY_DESKTOP, VAL_SCRTO, 0);
+}
+
 static
 INT
 SpiLoadMouse(PCWSTR pwszValue, INT iValue)
@@ -280,7 +295,7 @@ SpiUpdatePerUserSystemParameters()
     gspv.bDropShadow = 1;
     gspv.dwMenuShowDelay = 100;
 
-    gspv.iScrSaverTimeout = 600000; // TO in 10 minutes.
+    gspv.iScrSaverTimeout = SpiLoadTimeOut();
     gspv.bScrSaverActive = FALSE;
     gspv.bScrSaverRunning = FALSE;
 #if(WINVER >= 0x0600)