diff --git a/src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsDirectoryTenant.ps1 b/src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsDirectoryTenant.ps1
index b855e14764c5..7fd8dd231324 100644
--- a/src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsDirectoryTenant.ps1
+++ b/src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Generated.PowerShell.Commands/SwaggerPathCommands/Get-AzsDirectoryTenant.ps1
@@ -50,9 +50,8 @@ function Get-AzsDirectoryTenant
         [System.String]
         $ResourceId,
 
-        [Parameter(Mandatory = $true, ParameterSetName = 'ResourceId_DirectoryTenants_Get')]
-        [Parameter(Mandatory = $true, ParameterSetName = 'DirectoryTenants_List')]
-        [Parameter(Mandatory = $true, ParameterSetName = 'DirectoryTenants_Get')]
+        [Parameter(Mandatory = $false, ParameterSetName = 'DirectoryTenants_List')]
+        [Parameter(Mandatory = $false, ParameterSetName = 'DirectoryTenants_Get')]
         [System.String]
         $ResourceGroupName,
 
@@ -97,6 +96,11 @@ function Get-AzsDirectoryTenant
 
     $Tenant = $Name
 
+    if (-not $PSBoundParameters.ContainsKey('ResourceGroupName'))
+    {
+        $ResourceGroupName = "System." + (Get-AzureRMLocation).Location
+        $PSBoundParameters.Add("ResourceGroupName", $ResourceGroupName)
+    }
 
     if('ResourceId_DirectoryTenants_Get' -eq $PsCmdlet.ParameterSetName) {
         $GetArmResourceIdParameterValue_params = @{