diff --git a/include/class.config.php b/include/class.config.php
index 0a458764f65986e574a7d18a09d3994541c58443..126c96c900d3aca1955bf4241d8098ebd429bfe2 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -66,11 +66,10 @@ class Config {
             return $this->session[$key];
         elseif (isset($this->config[$key]))
             return $this->config[$key]['value'];
-        elseif ($default !== null)
-            return $this->set($key, $default);
         elseif (isset($this->defaults[$key]))
             return $this->defaults[$key];
-        return null;
+
+        return $default;
     }
 
     function exists($key) {
diff --git a/include/class.ostsession.php b/include/class.ostsession.php
index 1bcea436bd0115e957fd2c26da147f445190e63e..7541e19ec04aba50072abb7e495e48725316f5c7 100644
--- a/include/class.ostsession.php
+++ b/include/class.ostsession.php
@@ -21,7 +21,6 @@ class osTicketSession {
     var $id = '';
 
     function osTicketSession($ttl=0){
-
         $this->ttl =$ttl?$ttl:get_cfg_var('session.gc_maxlifetime');
         if(!$this->ttl)
             $this->ttl=SESSION_TTL;
@@ -40,6 +39,7 @@ class osTicketSession {
             register_shutdown_function('session_write_close');
         }
         //Start the session.
+        session_name('OSTSESSID');
         session_start();
     }