diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 2a4c5bbf8a..01dee23d40 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-14  Sancho Lerena <slerena@artica.es>
+
+	* FreeBSD/pandora_server.conf.new,
+	conf/pandora_server.conf.new,
+	conf/pandora_server.conf.windows: Modified default configuration
+	to avoid put all agents in the group id #2. 
+
 2014-08-14  Koichiro Kikuchi <koichiro@rworks.jp>
 
 	* pandora_server_installer: Fixed wrong chmod target.
diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new
index ae6c8dd292..05b458e0d7 100644
--- a/pandora_server/FreeBSD/pandora_server.conf.new
+++ b/pandora_server/FreeBSD/pandora_server.conf.new
@@ -253,7 +253,7 @@ braa_retries 3
 
 # Default group id for new agents created with Pandora FMS Data Server
 
-autocreate_group 2
+#autocreate_group 2
 
 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
 # set to 0 to disable (for security purposes, for example).
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index b47fb1e7bb..278a9c7f53 100755
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -263,7 +263,7 @@ braa_retries 3
 # Default group id for new agents created with Pandora FMS Data Server
 # If this token is enabled and Agent is setup with a fixed group, server settings will override agent settings
 
-autocreate_group 2
+#autocreate_group 2
 
 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
 # set to 0 to disable (for security purposes, for example).
diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows
index c44b9575f7..ad277da5e4 100644
--- a/pandora_server/conf/pandora_server.conf.windows
+++ b/pandora_server/conf/pandora_server.conf.windows
@@ -214,7 +214,7 @@ dataserver_threads 2
 #snmpget c:\pandora_server\bin\snmpget.exe
 
 # Default group id for new agents created with Pandora FMS Data Server
-autocreate_group 2
+#autocreate_group 2
 
 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
 # set to 0 to disable