diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index f7b979d617..1bbf980c35 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -386,7 +386,6 @@ Pandora_Windows_Service::getXmlHeader () {
 	string        agent_name, os_name, os_version, encoding, value, xml, address, parent_agent_name, agent_name_cmd;
 	string        custom_id, url_address, latitude, longitude, altitude, position_description, gis_exec, gis_result, agent_mode;
 	string        group_password, group_id, ehorus_conf;
-	string        group_password, group_id;
 	time_t        ctime;
 	struct tm     *ctime_tm = NULL;
 	int pos;
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index cb65df9c94..02b16bcdc3 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -344,7 +344,14 @@ sub process_xml_data ($$$$$) {
 		my $os = pandora_get_os ($dbh, $data->{'os_name'});
 		my $group_id = $pa_config->{'autocreate_group'};
 		if (! defined (get_group_name ($dbh, $group_id))) {
-			if (defined ($data->{'group'}) && $data->{'group'} ne '') {
+			if (defined ($data->{'group_id'}) && $data->{'group_id'} ne '') {
+				$group_id = $data->{'group_id'};
+				if (! defined (get_group_name ($dbh, $group_id))) {
+					pandora_event ($pa_config, "Unable to create agent '$agent_name': group ID '" . $group_id . "' does not exist.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
+					logger($pa_config, "Group ID " . $group_id . " does not exist.", 3);
+					return;
+				}
+			} elsif (defined ($data->{'group'}) && $data->{'group'} ne '') {
 				$group_id = get_group_id ($dbh, $data->{'group'});
 				if (! defined (get_group_name ($dbh, $group_id))) {
 					pandora_event ($pa_config, "Unable to create agent '$agent_name': group '" . $data->{'group'} . "' does not exist.", 0, 0, 0, 0, 0, 'error', 0, $dbh);