diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1
index e9182bb95717..47cdc60712c8 100644
--- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1
+++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1
@@ -4,7 +4,7 @@ function Invoke-CIPPStandardPasswordExpireDisabled {
     Internal
     #>
     param($Tenant, $Settings)
-    $GraphRequest = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/domains' -tenantid $Tenant
+    $GraphRequest = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/domains' -tenantid $Tenant
     $DomainswithoutPassExpire = $GraphRequest | Where-Object -Property passwordValidityPeriodInDays -NE '2147483647'
 
     If ($Settings.remediate) {
@@ -12,7 +12,13 @@ function Invoke-CIPPStandardPasswordExpireDisabled {
         if ($DomainswithoutPassExpire) {
             $DomainswithoutPassExpire | ForEach-Object {
                 try {
-                    New-GraphPostRequest -type Patch -tenantid $Tenant -uri "https://graph.microsoft.com/beta/domains/$($_.id)" -body '{"passwordValidityPeriodInDays": 2147483647 }'
+                    if ( $null -eq $_.passwordNotificationWindowInDays ) {
+                        $Body = '{"passwordValidityPeriodInDays": 2147483647, "passwordNotificationWindowInDays": 14 }'
+                        Write-Host "PasswordNotificationWindowInDays is null for $($_.id). Setting to the default of 14 days."
+                    } else {
+                        $Body = '{"passwordValidityPeriodInDays": 2147483647 }'
+                    }
+                    New-GraphPostRequest -type Patch -tenantid $Tenant -uri "https://graph.microsoft.com/v1.0/domains/$($_.id)" -body $Body
                     Write-LogMessage -API 'Standards' -tenant $tenant -message "Disabled Password Expiration for $($_.id)." -sev Info
                 } catch {
                     Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to disable Password Expiration for $($_.id). Error: $($_.exception.message)" -sev Error