diff --git a/application/config/autoload.php b/application/config/autoload.php
index 76835381d..baf545db6 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -58,7 +58,7 @@ $autoload['packages'] = array();
 |
 |	$autoload['libraries'] = array('user_agent' => 'ua');
 */
-$autoload['libraries'] = array('Session', 'AuthLib');
+$autoload['libraries'] = array('Session');
 
 /*
 | -------------------------------------------------------------------
diff --git a/application/libraries/AuthLib.php b/application/libraries/AuthLib.php
index 20b14bd01..f686eca4a 100644
--- a/application/libraries/AuthLib.php
+++ b/application/libraries/AuthLib.php
@@ -27,6 +27,8 @@ require_once FHCPATH.'include/authentication.class.php';
 
 class AuthLib extends authentication
 {
+	private $_ci; // CI instance
+
 	/**
 	 * Construct
 	 */
@@ -35,10 +37,7 @@ class AuthLib extends authentication
 		parent::__construct();
 
 		// Gets CI instance
-		$this->ci =& get_instance();
-
-		// Loads helper message to manage returning messages
-		$this->ci->load->helper('Message');
+		$this->_ci =& get_instance();
 	}
 
 	/**
@@ -83,9 +82,9 @@ class AuthLib extends authentication
 		$result = error(false);
 
 		// Load model PersonModel
-		$this->ci->load->model('person/person_model', 'PersonModel');
+		$this->_ci->load->model('person/person_model', 'PersonModel');
 
-		$person = $this->ci->PersonModel->loadWhere(array('zugangscode' => $code));
+		$person = $this->_ci->PersonModel->loadWhere(array('zugangscode' => $code));
 
 		if (hasData($person))
 		{
@@ -103,9 +102,9 @@ class AuthLib extends authentication
 		$result = error(false);
 
 		// Load model PersonModel
-		$this->ci->load->model('person/person_model', 'PersonModel');
+		$this->_ci->load->model('person/person_model', 'PersonModel');
 
-		$person = $this->ci->PersonModel->getPersonKontaktByZugangscode($code, $email);
+		$person = $this->_ci->PersonModel->getPersonKontaktByZugangscode($code, $email);
 
 		if (hasData($person))
 		{
@@ -124,9 +123,9 @@ class AuthLib extends authentication
 		$finalUserBasicDataByUID = null;
 
 		// Load model BenutzerModel
-		$this->ci->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
 
-		$benutzer = $this->ci->BenutzerModel->load($uid);
+		$benutzer = $this->_ci->BenutzerModel->load($uid);
 
 		if (hasData($benutzer))
 		{
diff --git a/application/libraries/CallerLib.php b/application/libraries/CallerLib.php
index d2387a723..33f0def52 100644
--- a/application/libraries/CallerLib.php
+++ b/application/libraries/CallerLib.php
@@ -33,9 +33,6 @@ class CallerLib
 		// Gets CI instance
 		$this->ci =& get_instance();
 
-		// Loads helper message to manage returning messages
-		$this->ci->load->helper('Message');
-
 		// Loads permission library
 		$this->ci->load->library('PermissionLib');
 	}
diff --git a/application/libraries/OrganisationseinheitLib.php b/application/libraries/OrganisationseinheitLib.php
index b98e8c2c0..746dff255 100644
--- a/application/libraries/OrganisationseinheitLib.php
+++ b/application/libraries/OrganisationseinheitLib.php
@@ -13,9 +13,6 @@ class OrganisationseinheitLib
 
 		// Loads model Organisationseinheit_model
 		$this->ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-
-		// Loads helper message to manage returning messages
-		$this->ci->load->helper('Message');
 	}
 
 	/**