diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index 216e3149e3..7c8d826289 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2023 Pandora FMS 
-# Version 7.0NG.775
+# Version 7.0NG.775
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
 # Foundation; either version 2 of the Licence or any later version
@@ -113,15 +113,20 @@ win32_monitoring_lib NT
 module_begin
 module_name CPU Load
 module_type generic_data
-module_wmiquery SELECT LoadPercentage FROM Win32_Processor
-module_wmicolumn LoadPercentage
-module_description CPU Load (%)
-module_min_warning 80
+module_wmiquery SELECT PercentProcessorTime FROM Win32_PerfFormattedData_PerfOS_Processor where name like '_Total'
+module_wmicolumn PercentProcessorTime
+module_max 100
+module_min 0
+module_description User CPU Usage (%)
+module_min_warning 70
 module_max_warning 90
 module_min_critical 91
 module_max_critical 0
+module_unit %
+module_group System
 module_end
 
+
 # Number processes
 module_begin
 module_name Number processes