diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 6091a1e976..9fe961b093 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-05  Esteban Sanchez  <estebans@artica.es>
+
+	* pandora_windows_service.cc: Fixed a bug when the agent name is not
+	configured and should be getted from the system.
+
+	* bin/PandoraAgent.exe: Updated to last commit.
+
 2006-12-05 Raul Mateos <raulofpandora@gmail.com>
 
 	* installer/Pandora_Windows_Agent-1.2.0-Setup.exe: Updated installer.
diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe
index 4a973d9658..6d15cc3920 100755
Binary files a/pandora_agents/win32/bin/PandoraAgent.exe and b/pandora_agents/win32/bin/PandoraAgent.exe differ
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 6b084628fd..b04a5a74e5 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -132,10 +132,10 @@ Pandora_Windows_Service::getXmlHeader () {
         agent = new TiXmlElement ("agent_data");
 
         value = conf->getValue ("agent_name");
-        agent->SetAttribute ("agent_name", value);
         if (value == "") {
                 value = Pandora_Windows_Info::getSystemName ();
         }
+        agent->SetAttribute ("agent_name", value);
         
         agent->SetAttribute ("version", getPandoraAgentVersion ());