diff --git a/pandora_console/AUTHORS b/pandora_console/AUTHORS
index aab7d5f8ed..01384a60a4 100644
--- a/pandora_console/AUTHORS
+++ b/pandora_console/AUTHORS
@@ -4,6 +4,7 @@ Jorge Gonzalez <jorge.gonzalez@artica.es>
 Raul Mateos <raulofpandora@gmail.com>
 Ramon Novoa <ramon.novoa@artica.es>
 Evi Vanoost <vanooste@rcbi.rochester.edu>
+Miguel de Dios <miguel.dedios@artica.es
 
 See full list of contributors on:
 
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index cfc15b7cee..22a46497a6 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-18	Miguel de Dios <miguel.dedios@artica.es>
+
+	* include/functions_config.php: Fix save change language in setup.
+	Fixes: #2777463
+
 2009-06-10  Esteban Sanchez  <estebans@artica.es>
 
 	* operation/events/events.php: Removed all events on select elements.
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 97b3b2e539..c1c574433d 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -76,9 +76,10 @@ function update_config () {
 		$style = substr ($style, 0, strlen ($style) - 4);
 	
 	/* Workaround for ugly language and language_code missmatch */
-	$config['language_code'] = (string) get_parameter ('language', $config["language"]);
-	update_config_value ('language_code', $config['language_code']);
-	$config["language"] = $config['language_code'];
+	//$config['language_code'] = (string) get_parameter ('language', $config["language"]);
+	update_config_value ('language_code', (string) get_parameter ('language', $config["language"]));
+	//$config["language"] = $config['language_code'];
+	$config["language"] = (string) get_parameter ('language', $config["language"]);
 	
 	update_config_value ('remote_config', (string) get_parameter ('remote_config', $config["remote_config"]));
 	update_config_value ('block_size', (int) get_parameter ('block_size', $config["block_size"]));