diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f296fd567a..1d23b4aeeb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* operation/integria_incidents/incident.incident.php,
+	operation/integria_incidents/incident.php: Fixed several fields of manage
+	incident form.
+
+	MERGED FROM 4.0.2
+	
 2012-11-20 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* operation/integria_incidents/incident.php: Fixed an error printing messages
diff --git a/pandora_console/operation/integria_incidents/incident.incident.php b/pandora_console/operation/integria_incidents/incident.incident.php
index dd9c01d9c2..d288837352 100644
--- a/pandora_console/operation/integria_incidents/incident.incident.php
+++ b/pandora_console/operation/integria_incidents/incident.incident.php
@@ -82,13 +82,13 @@ $table->width = "98%";
 $table->class = "databox";
 
 $table->data = array();
-$table->colspan[0][0] = 3;
+$table->colspan[0][0] = 2;
 $table->colspan[3][0] = 3;
 $table->colspan[4][0] = 3;
 
 $table->data[0][0] = "<b>".__('Title')."</b><br/>".html_print_input_text("title", $result['titulo'], '', 80, 255, true);
 if (isset($result['id_incidencia'])) {
-	$table->data[1][2] = "<b>".__('Assigned user')."</b><br/>".html_print_select ($users, 'id_user', $result['id_usuario'], '', '', 0, true, false, false);
+	$table->data[1][2] = "<b>".__('Assigned user')."</b><br/>".html_print_select ($users, 'id_user_assigned', $result['id_usuario'], '', '', 0, true, false, false);
 }
 else {
 	$table->data[1][2] = "";
@@ -97,7 +97,7 @@ if (isset($groups)) {
 	$table->data[1][0] = "<b>".__('Group')."</b><br/>".html_print_select ($groups, 'group', $result['id_grupo'], '', '', 0, true, false, false);
 }
 $table->data[1][1] = "<b>".__('Priority')."</b><br/>".html_print_select (incidents_get_priorities (), 'priority', $result['prioridad'], '', '', 0, true, false, false);
-$table->data[1][2] = "<b>".__('Creator')."</b><br/>".$result['id_creator'];
+$table->data[0][1] = "<b>".__('Creator')."</b><br/>".$result['id_creator'];
 
 if (isset($result['id_incidencia'])) {
 	$table->data[2][0] = "<b>".__('Source')."</b><br/>".html_print_select ($sources, 'source', $result['origen'], '', '', 0, true, false, false);
diff --git a/pandora_console/operation/integria_incidents/incident.php b/pandora_console/operation/integria_incidents/incident.php
index b121ee1709..19882817ff 100755
--- a/pandora_console/operation/integria_incidents/incident.php
+++ b/pandora_console/operation/integria_incidents/incident.php
@@ -84,7 +84,7 @@ if($update_incident == 1) {
 	$values[6] = get_parameter('source');
 	$values[7] = get_parameter('resolution');
 	$values[8] = get_parameter('status');
-	$values[9] = get_parameter('creator', get_parameter('creator_fix'));
+	$values[9] = get_parameter('id_user_assigned');
 
 	$params = implode($token, $values);