diff --git a/CHANGELOG b/CHANGELOG
index d25848b2..a2b565a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+DROP TABLE `sessions2`;
+
 queXS 1.13.0 - Changes since 1.12.1
 
 Overall changes:
diff --git a/database/quexs.sql b/database/quexs.sql
index e36c7798..2d15698f 100644
--- a/database/quexs.sql
+++ b/database/quexs.sql
@@ -1507,24 +1507,6 @@ INSERT INTO `sample_var_type` (`type`, `description`, `table`) VALUES(8, 'Email
 
 -- --------------------------------------------------------
 
---
--- Table structure for table `sessions2`
---
-
-CREATE TABLE `sessions2` (
-  `sesskey` varchar(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `expiry` datetime NOT NULL,
-  `expireref` varchar(250) COLLATE utf8_unicode_ci DEFAULT '',
-  `created` datetime NOT NULL,
-  `modified` datetime NOT NULL,
-  `sessdata` longtext COLLATE utf8_unicode_ci,
-  PRIMARY KEY (`sesskey`),
-  KEY `sess2_expiry` (`expiry`),
-  KEY `sess2_expireref` (`expireref`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- --------------------------------------------------------
-
 --
 -- Table structure for table `setting`
 --
diff --git a/include/limesurvey/config.php b/include/limesurvey/config.php
index f98ed831..d181e83f 100644
--- a/include/limesurvey/config.php
+++ b/include/limesurvey/config.php
@@ -67,22 +67,25 @@ $debug              =   0;                 // Set this to 1 if you are looking f
                                            // LimeSurvey developers: Set this to 3 to circumvent the restriction to remove the installation directory and full access to standard templates
                                            // or to change the password. If you set it to 3 then PHP STRICT warnings will be shown additionally.
 
-$defaultlang = DEFAULT_LOCALE;
+$defaultlang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+if (empty($defaultlang)) $defaultlang = DEFAULT_LOCALE;
+
 $defaulttemplate = "quexs";
-$useWebserverAuth = true;
-$WebserverAuth_autocreateUser = true;
-$WebserverAuth_autouserprofile = Array(
-				'full_name' => 'autouser',
-				'email' => $siteadminemail,
-				'htmledtirmode' => $defaulthtmleditormode,
-				'templatelist' => 'default,basic',
-				'create_survey' => 1,
-				'lang' => DEFAULT_LOCALE,
-				'create_user' => 1,
-				'delete_user' => 1,
-				'superadmin' => 1,
-				'configurator' => 1,
-				'manage_template' => 1,
-				'manage_label' => 1);
-
+//$useWebserverAuth = true;
+//$WebserverAuth_autocreateUser = true;
+//$WebserverAuth_autouserprofile = Array(
+//				'full_name' => 'autouser',
+//				'email' => $siteadminemail,
+//				'htmledtirmode' => $defaulthtmleditormode,
+//				'templatelist' => 'default,basic',
+//				'create_survey' => 1,
+//				'lang' => DEFAULT_LOCALE,
+//				'create_user' => 1,
+//				'delete_user' => 1,
+//				'superadmin' => 1,
+//				'configurator' => 1,
+//				'manage_template' => 1,
+//				'manage_label' => 1);
+//
 
+$sessionhandler     =  'db';