diff --git a/htdocs/application/config/autoload.php b/htdocs/application/config/autoload.php
index a765dcb..c83e765 100644
--- a/htdocs/application/config/autoload.php
+++ b/htdocs/application/config/autoload.php
@@ -52,7 +52,7 @@ $autoload['packages'] = array();
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = array('database', 'session', 'carabiner');
+$autoload['libraries'] = array('database', 'carabiner');
 
 
 /*
diff --git a/htdocs/application/controllers/Main.php b/htdocs/application/controllers/Main.php
index d88041b..3d773dd 100644
--- a/htdocs/application/controllers/Main.php
+++ b/htdocs/application/controllers/Main.php
@@ -93,6 +93,9 @@ class Main extends CI_Controller
 			$this->dbforge->add_key('timestamp');
 			$this->dbforge->create_table('sessions', true);
 		}
+
+		// load this after db has been initialized
+		$this->load->library('session');
 		
 		if (!$this->db->table_exists('pastes')) 
 		{