diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 905f1af342..56316fd520 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/config_process.php: Fixed wrong condition when global 
+	configuration for "flash_charts" option is override by user value.
+
 2011-03-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/db/oracle.php: Added new functions for Oracle support.
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 1b2b10af17..f2c8f7b8f1 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -104,9 +104,9 @@ if (isset ($config['id_user'])){
 	}
 
 	// If block_size or flash_chart are provided then override global settings
-	if (!empty($userinfo["block_size"]) && $userinfo["block_size"] != 0)
+	if (!empty($userinfo["block_size"]) && ($userinfo["block_size"] != 0))
 		$config["block_size"] = $userinfo["block_size"];
-	if (!empty($userinfo["flash_charts"]) && $userinfo["flash_charts"] == -1)
+	if ($userinfo["flash_chart"] != -1)
 		$config["flash_charts"] = $userinfo["flash_chart"];			
 
 	// Each user could have it's own timezone)