diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef1142f950..763c693a0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 * AADDeviceRegistrationPolicy
   * Fixed an issue where the AzureADJoinIsAdminConfigurable was not returned by the
     Get-TargetResource function.
+  * Fix issue setting Selected Users and Groups for Entra Join.
+    FIXES [#5798](https://github.com/microsoft/Microsoft365DSC/issues/5798)
 * AADGroup
   * Returns an empty array for roles and licenses from the Get-TargetResource
     function instead of null when no instances are found.
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1
index c95c3c1073..0e3eea3912 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1
@@ -407,8 +407,8 @@ function Set-TargetResource
             isAdminConfigurable = $AzureADJoinIsAdminConfigurable
             allowedToJoin       = @{
                 '@odata.type' = $azureADRegistrationAllowedToRegister
-                users         = $AzureADAllowedToJoinUsers
-                groups        = $AzureADAllowedToJoinGroups
+                users         = $azureADRegistrationAllowedUsers
+                groups        = $azureADRegistrationAllowedGroups
             }
             localAdmins         = @{
                 enableGlobalAdmins = $LocalAdminsEnableGlobalAdmins