diff --git a/reactos/boot/bootdata/hivedef_arm.inf b/reactos/boot/bootdata/hivedef_arm.inf
index fb28b85fe5d..9669902636d 100644
--- a/reactos/boot/bootdata/hivedef_arm.inf
+++ b/reactos/boot/bootdata/hivedef_arm.inf
@@ -30,7 +30,7 @@ HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000"
 HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
 HKCU,"Control Panel\Desktop","FontSmoothing",2,"0"
 HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00
-HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80
+HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80
 HKCU,"Control Panel\Desktop","LowPowerActive",,"0"
 HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400"
 HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3"
diff --git a/reactos/boot/bootdata/hivedef_i386.inf b/reactos/boot/bootdata/hivedef_i386.inf
index 4346cb62968..102a5fc5955 100644
--- a/reactos/boot/bootdata/hivedef_i386.inf
+++ b/reactos/boot/bootdata/hivedef_i386.inf
@@ -30,7 +30,7 @@ HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000"
 HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
 HKCU,"Control Panel\Desktop","FontSmoothing",2,"0"
 HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00
-HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80
+HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80
 HKCU,"Control Panel\Desktop","LowPowerActive",,"0"
 HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400"
 HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3"
diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
index 4417380e232..56f5ad1b2db 100644
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@@ -384,9 +384,9 @@ ButtonProc(IN HWND hwndDlg,
                 //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed);
 
 #if (WINVER >= 0x0500)
-                SystemParametersInfo(SPI_SETMOUSECLICKLOCK, pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE);
+                SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, &pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
                 if (pButtonData->g_ClickLockEnabled)
-                   SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE);
+                   SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
 #endif
             }
             else if (lppsn->hdr.code == PSN_RESET)
diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
index 6861d780543..5ed1e09f311 100644
--- a/reactos/subsystems/win32/win32k/ntuser/sysparams.c
+++ b/reactos/subsystems/win32/win32k/ntuser/sysparams.c
@@ -70,6 +70,7 @@ static const WCHAR* VAL_CLICKLOCKTIME = L"ClickLockTime";
 #if (_WIN32_WINNT >= 0x0600)
 static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars";
 #endif
+static const WCHAR* VAL_USERPREFMASK = L"UserPreferencesMask";
 
 static const WCHAR* KEY_MDALIGN = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows";
 static const WCHAR* VAL_MDALIGN = L"MenuDropAlignment";
@@ -515,7 +516,7 @@ UINT_PTR
 SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl)
 {
     DWORD dwRegMask;
-    BOOL bValue = pvValue ? 1 : 0;
+    BOOL bValue = *(BOOL *)pvValue;
 
     REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION);
 
@@ -527,7 +528,7 @@ SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl)
     {
         /* Read current value */
         RegReadUserSetting(KEY_DESKTOP,
-                           L"UserPreferencesMask",
+                           VAL_USERPREFMASK,
                            REG_BINARY,
                            &dwRegMask,
                            sizeof(DWORD));
@@ -537,7 +538,7 @@ SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl)
 
         /* write back value */
         RegWriteUserSetting(KEY_DESKTOP,
-                            L"UserPreferencesMask",
+                            VAL_USERPREFMASK,
                             REG_BINARY,
                             &dwRegMask,
                             sizeof(DWORD));