diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index 70db4cb2ca..506444b169 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -163,7 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql = "delete from v_contact_groups ";
 			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$sql .= "and contact_uuid = '".$contact_uuid."' ";
-			$sql .= "and group_uuid = '".$_SESSION['groups'][0]['user_uuid']."' ";
+			$sql .= "and group_uuid = '".$_SESSION["user_uuid"]."' ";
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
 			unset($prep_statement, $sql);
@@ -177,7 +177,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
 			unset($prep_statement, $sql);
-			$group_uuid = $_SESSION['groups'][0]['user_uuid'];
+			$group_uuid = $_SESSION["user_uuid"];
 		}
 
 		//handle insertion of contact group (or private contact, if not shared)
@@ -623,7 +623,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql = "select count(*) as num_rows from v_contact_groups ";
 			$sql .= "where domain_uuid = '".$domain_uuid."' ";
 			$sql .= "and contact_uuid = '".$contact_uuid."' ";
-			$sql .= "and group_uuid = '".$_SESSION['groups'][0]['user_uuid']."' ";
+			$sql .= "and group_uuid = '".$_SESSION["user_uuid"]."' ";
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
 			$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
@@ -666,7 +666,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "and g.domain_uuid = '".$domain_uuid."' ";
 			$sql .= "and cg.domain_uuid = '".$domain_uuid."' ";
 			$sql .= "and cg.contact_uuid = '".$contact_uuid."' ";
-			$sql .= "and cg.group_uuid <> '".$_SESSION['groups'][0]['user_uuid']."' ";
+			$sql .= "and cg.group_uuid <> '".$_SESSION["user_uuid"]."' ";
 			$sql .= "order by g.group_name asc ";
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php
index 6e702773b8..818fcaaa2a 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -78,7 +78,7 @@ require_once "resources/paging.php";
 		$user_group_uuids[] = $group_data['group_uuid'];
 	}
 	//add user's uuid to group uuid list to include private (non-shared) contacts
-	$user_group_uuids[] = $_SESSION['groups'][0]['user_uuid'];
+	$user_group_uuids[] = $_SESSION["user_uuid"];
 
 	//prepare to page the results
 		$sql = "select count(*) as num_rows from v_contacts ";