diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index 718e23b887..9053472c0c 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -495,6 +495,7 @@ else {
 
 	$sql = "SELECT * FROM v_groups ";
 	$sql .= "where domain_uuid = '".$domain_uuid."' ";
+	$sql .= "or domain_uuid is null ";
 	if (sizeof($assigned_groups) > 0) {
 		$sql .= "and group_uuid not in ('".implode("','",$assigned_groups)."') ";
 	}