diff --git a/webui/controller/login/login.php b/webui/controller/login/login.php
index f711b7b..f702ea5 100644
--- a/webui/controller/login/login.php
+++ b/webui/controller/login/login.php
@@ -18,6 +18,7 @@
 
 
       $request = Registry::get('request');
+      $session = Registry::get('session');
 
       $db = Registry::get('db');
 
@@ -42,10 +43,10 @@
 
          if($this->model_user_auth->checkLogin($this->request->post['username'], $_POST['password']) == 1) {
 
-            $this->model_user_prefs->get_user_preferences($_SESSION['username']);
+            $this->model_user_prefs->get_user_preferences($session->get('username'));
 
             if(ENABLE_SAAS == 1) {
-               $this->model_saas_customer->online($_SESSION['username']);
+               $this->model_saas_customer->online($session->get('email'));
             }
 
             LOGGER('logged in');
diff --git a/webui/controller/login/logout.php b/webui/controller/login/logout.php
index 6b4f05c..29d817e 100644
--- a/webui/controller/login/logout.php
+++ b/webui/controller/login/logout.php
@@ -11,6 +11,7 @@
       $this->layout = "common/layout-empty";
 
       $request = Registry::get('request');
+      $session = Registry::get('session');
 
       $db = Registry::get('db');
 
@@ -21,7 +22,7 @@
 
       if(ENABLE_SAAS == 1) {
          $this->load->model('saas/customer');
-         $this->model_saas_customer->offline(Registry::get('username'));
+         $this->model_saas_customer->offline($session->get('email'));
       }
 
       logout();
diff --git a/webui/index.php b/webui/index.php
index 5b4ac5b..2735652 100644
--- a/webui/index.php
+++ b/webui/index.php
@@ -80,10 +80,10 @@
    }
 
    if(ENABLE_SAAS == 1) {
-      $query = $db->query("UPDATE " . TABLE_ONLINE . " SET last_activity=? WHERE username=? AND ipaddr=?", array(NOW, Registry::get('username'), $_SERVER['REMOTE_ADDR']));
+      $query = $db->query("UPDATE " . TABLE_ONLINE . " SET last_activity=? WHERE username=? AND ipaddr=?", array(NOW, $session->get('email'), $_SERVER['REMOTE_ADDR']));
 
       if($db->countAffected() == 0) {
-         $query = $db->query("INSERT INTO " . TABLE_ONLINE . " (username, ts, last_activity, ipaddr) VALUES(?,?,?,?)", array(Registry::get('username'), NOW, NOW, $_SERVER['REMOTE_ADDR']));
+         $query = $db->query("INSERT INTO " . TABLE_ONLINE . " (username, ts, last_activity, ipaddr) VALUES(?,?,?,?)", array($session->get('email'), NOW, NOW, $_SERVER['REMOTE_ADDR']));
       }
    }