diff --git a/htdocs/application/models/Languages.php b/htdocs/application/models/Languages.php
index e93834a3..dfc7fb9f 100644
--- a/htdocs/application/models/Languages.php
+++ b/htdocs/application/models/Languages.php
@@ -16,12 +16,15 @@ class Languages extends CI_Model
 	function __construct() 
 	{
 		parent::__construct();
-	
 		$this->load->config('geshi_languages');
 		$this->geshi_languages = $this->config->item('geshi_languages');
-	
-		$this->load->config('config');
 		$this->favorite_languages = $this->config->item('favorite_languages');
+		
+		if ($this->favorite_languages === NULL) 
+		{
+			$this->load->config('config');
+			$this->favorite_languages = $this->config->item('favorite_languages');
+		}
 	}
 	
 	function valid_language($lang) 
@@ -33,19 +36,18 @@ function get_languages()
 	{
 		$data = array();
 		
-		if(is_array($this->favorite_languages)) 
+		if (is_array($this->favorite_languages)) 
 		{
 			foreach ($this->favorite_languages as $key) 
 			{
 				$data[$key] = $this->geshi_languages[$key];
 			}
-		
 			$data["0"] = "-----------------";
 		}
-		
 		foreach ($this->geshi_languages as $key => $value) 
 		{
-			if (!in_array($key, $a))
+			
+			if (!in_array($key, $data)) 
 			{
 				$data[$key] = $value;
 			}