diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d9a49b8772..c83190baec 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-05  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* godmode/gis_maps/configure_gis_map.php: fixed the form to create or
+	update gis connections.
+	
+	Fixes: #3403160
+
 2011-09-03  Junichi Satoh  <junichi@rworks.jp>
 
 	* godmode/massive/massive_delete_alerts.php,
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index 88c11afb3f..c25e888cf8 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -298,6 +298,7 @@ switch ($action) {
 }
 
 $table->width = '98%';
+
 $table->data = array ();
 $table->valign[0] = 'top';
 
@@ -362,6 +363,24 @@ $table->data[8][1] = html_print_input_text ('map_default_latitude', $map_default
 $table->data[9][0] = __('Default Altitude') . ':';
 $table->data[9][1] = html_print_input_text ('map_default_altitude', $map_default_altitude, '', 4, 8, true);
 
+echo '<div class="action-buttons" style="margin-top: 20px; width: '.$table->width.'">';
+switch ($action) {
+	case 'save_new':
+	case 'edit_map':
+	case 'update_saved':
+		if (!empty($invalidFields)) {
+			html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
+		}
+		else {
+			html_print_submit_button(_('Update map'), 'update_button', false, 'class="sub upd"');
+		}
+		break;
+	case 'new_map':
+		html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
+		break;
+}
+echo '</div>';
+
 html_print_table($table);
 
 echo "<h3>" . __('Layers') . ui_print_help_tip (__('Each layer can show agents from one group or the agents added to that layer or both.'), true). "</h3>";