diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php
index 462427ff33..e69359598e 100644
--- a/core/users/app_defaults.php
+++ b/core/users/app_defaults.php
@@ -136,7 +136,6 @@ if ($domains_processed == 1) {
 					//get the group_uuid
 						$sql = "select group_uuid from v_groups ";
 						$sql .= "where group_name = '".$row['group_name']."' ";
-						//$sql .= "and domain_uuid = '".$row['domain_uuid']."' ";
 						$prep_statement_sub = $db->prepare($sql);
 						$prep_statement_sub->execute();
 						$sub_result = $prep_statement_sub->fetch(PDO::FETCH_ASSOC);
diff --git a/core/users/groups.php b/core/users/groups.php
index 0f0edfb558..7707d59fd2 100644
--- a/core/users/groups.php
+++ b/core/users/groups.php
@@ -77,6 +77,7 @@ require_once "resources/require.php";
 
 	$sql = "SELECT * FROM v_groups ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
+	$sql .= "or domain_uuid is null ";
 	$sql .= "order by group_name asc ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
diff --git a/core/users/permissions_copy.php b/core/users/permissions_copy.php
index 5e01748cd2..3f5e91a8e9 100644
--- a/core/users/permissions_copy.php
+++ b/core/users/permissions_copy.php
@@ -56,6 +56,7 @@ require_once "resources/require.php";
 		//get the groups data
 			$sql = "select * from v_groups ";
 			$sql .= "where domain_uuid = '".$domain_uuid."' ";
+			$sql .= "or domain_uuid is null ";
 			$sql .= "and group_name = '".$group_name."' ";
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
diff --git a/core/users/signup.php b/core/users/signup.php
index fbe0baf4a8..6be3dba9c7 100644
--- a/core/users/signup.php
+++ b/core/users/signup.php
@@ -278,6 +278,7 @@ if (count($_POST)>0 && check_str($_POST["persistform"]) != "1") {
 	echo "		<td class='vtable'>";
 	$sql = "SELECT * FROM v_groups ";
 	$sql .= "where domain_uuid = '".$domain_uuid."' ";
+	$sql .= "or domain_uuid is null ";
 	$sql .= "order by group_name asc ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
diff --git a/core/users/users.php b/core/users/users.php
index e995228717..6d597bfb5a 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -234,4 +234,4 @@ echo "</table>";
 echo "</div>";
 echo "<br><br>";
 
-?>
+?>
\ No newline at end of file
diff --git a/resources/install.php b/resources/install.php
index 83afc91551..590c46706b 100644
--- a/resources/install.php
+++ b/resources/install.php
@@ -1068,14 +1068,12 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 		foreach($tmp as $row) {
 			$sql = "insert into v_groups ";
 			$sql .= "(";
-			$sql .= "domain_uuid, ";
 			$sql .= "group_uuid, ";
 			$sql .= "group_name, ";
 			$sql .= "group_description ";
 			$sql .= ") ";
 			$sql .= "values ";
 			$sql .= "(";
-			$sql .= "'".$_SESSION["domain_uuid"]."', ";
 			$sql .= "'".uuid()."', ";
 			$sql .= "'".$row['group_name']."', ";
 			$sql .= "'".$row['group_description']."' ";
@@ -1181,14 +1179,12 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 							$sql = "insert into v_group_permissions ";
 							$sql .= "(";
 							$sql .= "group_permission_uuid, ";
-							$sql .= "domain_uuid, ";
 							$sql .= "permission_name, ";
 							$sql .= "group_name ";
 							$sql .= ") ";
 							$sql .= "values ";
 							$sql .= "(";
 							$sql .= "'".uuid()."', ";
-							$sql .= "'".$_SESSION["domain_uuid"]."', ";
 							$sql .= "'".$row['name']."', ";
 							$sql .= "'".$group."' ";
 							$sql .= ");";