diff --git a/application/config/autoload.php b/application/config/autoload.php
index 4b04f39e..3b47ec9d 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -64,7 +64,7 @@ $autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib', 'Fre
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array('url', 'security');
+$autoload['helper'] = array('url', 'security', 'language');
 
 
 /*
@@ -96,8 +96,17 @@ $autoload['config'] = array('cloudlog', 'bands', 'lotw');
 |
 */
 
-$autoload['language'] = array('general_words');
-
+$autoload['language'] = array(
+    'account',
+    'contesting',
+    'eqsl',
+    'general_words',
+    'lotw',
+    'menu',
+    'notes',
+    'qslcard',
+    'qso',
+    );
 
 /*
 | -------------------------------------------------------------------
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 7f18885c..05230e40 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -85,10 +85,6 @@ class CI_Controller {
 		$this->load =& load_class('Loader', 'core');
 		$this->load->initialize();
 
-		$this->lang->load(array(
-			'menu'
-		));
-
 		log_message('info', 'Controller Class Initialized');
 	}