diff --git a/admin/index.php b/admin/index.php
index e2ae1406..239dfa79 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -44,7 +44,7 @@ include ("../config.inc.php");
 include ("auth-admin.php");
 
  include ("../functions/functions.xhtml.php");
- $username = $_SESSION['loginID'];
+ $username = $_SESSION['user'];
  $g = 0;
  if (isset($_GET['g'])) 
    $g = intval($_GET['g']);
diff --git a/functions/functions.client.php b/functions/functions.client.php
index 99dc1fea..9107b56a 100644
--- a/functions/functions.client.php
+++ b/functions/functions.client.php
@@ -50,12 +50,12 @@ function get_client_id()
 {
 	global $db;
 
-  if (!isset($_SESSION['loginID']))
+  if (!isset($_SESSION['user']))
     return false;
 
 	$sql = "SELECT client_id
 		FROM client
-		WHERE username = '{$_SESSION['loginID']}'";
+		WHERE username = '{$_SESSION['user']}'";
 
 	$o = $db->GetRow($sql);
 
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index a426f8d7..0916bec1 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -900,7 +900,7 @@ function get_extension($operator_id)
  */
 function get_operator_id()
 {
-	if (!isset($_SESSION['loginID']))
+	if (!isset($_SESSION['user']))
 	{
     print "<p>" . T_("ERROR: You are not logged in.") . "</p>";
 		die();
@@ -910,7 +910,7 @@ function get_operator_id()
 
 	$sql = "SELECT operator_id
 		FROM operator
-		WHERE username = " . $db->qstr($_SESSION['loginID']) . "
+		WHERE username = " . $db->qstr($_SESSION['user']) . "
 		AND enabled = 1";
 
 	$o = $db->GetRow($sql);