diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index df969bde18..22b48f97cd 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-24  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent: Merged from 4.0 branch. Leave the secondary server
+	  password empty by default. Fixes bug #3519520.
+
 2012-04-20  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent_installer: Removed an unused variable.
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 5a30b03475..5e77658da0 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -152,7 +152,7 @@ my %Conf = (
 	'secondary_server_path' => '/var/spool/pandora/data_in',
 	'secondary_server_port' => 41121,
 	'secondary_transfer_mode' => 'tentacle',
-	'secondary_server_pwd' => 'mypassword',
+	'secondary_server_pwd' => '',
 	'secondary_server_ssl' => 'no',
 	'secondary_server_opts' => '',
 	'autotime' => 0,