diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 10f404eedd..13ea2ba651 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -211,7 +211,7 @@ include "root.php";
 				$sql .= "and c.contact_uuid in ( ";
 				$sql .= "	select contact_uuid from v_contact_groups ";
 				$sql .= "	where group_uuid in ( ";
-				$sql .= "		select group_uuid from v_group_users ";
+				$sql .= "		select group_uuid from v_user_groups ";
 				$sql .= "		where user_uuid = '$device_user_uuid' ";
 				$sql .= "		and domain_uuid = '$domain_uuid' ";
 				$sql .= "	)) ";
@@ -292,11 +292,11 @@ include "root.php";
 			// Get a list of groups the user has access to see.
 			$sql = "SELECT DISTINCT g.group_uuid, g.group_name, g.group_description ";
 			$sql .= "FROM v_groups g ";
-			$sql .= "	INNER JOIN v_group_users gu ";
-			$sql .= "	ON gu.group_uuid=g.group_uuid ";
+			$sql .= "	INNER JOIN v_user_groups ug ";
+			$sql .= "	ON ug.group_uuid = g.group_uuid ";
 			$sql .= "	INNER JOIN v_contact_groups cg ";
-			$sql .= "	ON cg.group_uuid=g.group_uuid ";
-			$sql .= "WHERE gu.user_uuid = '$device_user_uuid' ";
+			$sql .= "	ON cg.group_uuid = g.group_uuid ";
+			$sql .= "WHERE ug.user_uuid = '$device_user_uuid' ";
 			if ( $global_contact_groups['enabled'] ){
 				$sql .= "UNION ";
 				$sql .= "SELECT g.group_uuid, g.group_name, g.group_description ";
@@ -323,10 +323,10 @@ include "root.php";
 			$sql .= "	SELECT cg.contact_uuid";
 			$sql .= "	FROM v_contact_groups cg ";
 			$sql .= "	WHERE cg.group_uuid IN (";
-			$sql .= "		SELECT gu.group_uuid ";
-			$sql .= "		FROM v_group_users gu ";
-			$sql .= "		WHERE gu.user_uuid = '$device_user_uuid' ";
-			$sql .= "		AND gu.domain_uuid = '$domain_uuid' ";
+			$sql .= "		SELECT ug.group_uuid ";
+			$sql .= "		FROM v_user_groups ug ";
+			$sql .= "		WHERE ug.user_uuid = '$device_user_uuid' ";
+			$sql .= "		AND ug.domain_uuid = '$domain_uuid' ";
 			if ( $global_contact_groups['enabled'] ){
 				$sql .= "	UNION ";
 				$sql .= "	SELECT g.group_uuid ";