diff --git a/src/KeyVault/KeyVault.Test/LiveTests/ManagedHsmDataPlaneLiveTests/TestSetting.ps1 b/src/KeyVault/KeyVault.Test/LiveTests/ManagedHsmDataPlaneLiveTests/TestSetting.ps1
index b1db4d1a6381..b6f6c3a7720e 100644
--- a/src/KeyVault/KeyVault.Test/LiveTests/ManagedHsmDataPlaneLiveTests/TestSetting.ps1
+++ b/src/KeyVault/KeyVault.Test/LiveTests/ManagedHsmDataPlaneLiveTests/TestSetting.ps1
@@ -5,11 +5,10 @@ Invoke-LiveTestScenario -Name "Get and update key vault setting in a MSHM" -Desc
     $rgName = $rg.ResourceGroupName
     $hsmName = "bezmhsm" + (New-LiveTestRandomName -Option AllNumbers)
     $hsmLocation = 'eastus2euap'
-    $adminId = (Get-AzADUser -StartsWith Beisi).Id
+    $appId = (Get-AzContext).Account.Id
+    $adminId = (Get-AzADServicePrincipal -ApplicationId $appId).Id
     $hsmObject = New-AzKeyVaultManagedHsm -HsmName $hsmName -ResourceGroupName $rgName -Location $hsmLocation -Administrator $adminId
-    Start-Sleep 1800
-    New-AzKeyVaultRoleAssignment -HsmName $hsmName -RoleDefinitionName "Managed HSM Crypto User" -ObjectId $adminId
-    Export-AzKeyVaultSecurityDomain -Certificates "$PSScriptRoot\sd1.cer", "$PSScriptRoot\sd2.cer", "$PSScriptRoot\sd3.cer" -Quorum 2 -OutputPath $PSScriptRoot/sd.ps.json -Name $hsmName
+    Export-AzKeyVaultSecurityDomain -Certificates "$PSScriptRoot\sd1.cer", "$PSScriptRoot\sd2.cer", "$PSScriptRoot\sd3.cer" -Quorum 2 -OutputPath $PSScriptRoot/sd.ps.json -Name $hsmName -Force
     $setting = $hsmObject | Get-AzKeyVaultSetting -Name "AllowKeyManagementOperationsThroughARM"
     $updatedSetting= $setting | Update-AzKeyVaultSetting -Value true -PassThru
     Assert-AreEqual $updatedSetting.Value "true"
diff --git a/src/KeyVault/KeyVault.Test/LiveTests/TestLiveScenarios.ps1 b/src/KeyVault/KeyVault.Test/LiveTests/TestLiveScenarios.ps1
index 89623925de63..f065d688d7d2 100644
--- a/src/KeyVault/KeyVault.Test/LiveTests/TestLiveScenarios.ps1
+++ b/src/KeyVault/KeyVault.Test/LiveTests/TestLiveScenarios.ps1
@@ -208,4 +208,4 @@ Invoke-LiveTestScenario -Name "Backup and restore key vault secret" -Description
 }
 
 & "$PSScriptRoot\KeyVaultDataPlaneLiveTests\TestNetworkRuleSet.ps1"
-# & "$PSScriptRoot\ManagedHsmDataPlaneLiveTests\TestSetting.ps1"
\ No newline at end of file
+& "$PSScriptRoot\ManagedHsmDataPlaneLiveTests\TestSetting.ps1"
\ No newline at end of file
diff --git a/src/KeyVault/KeyVault/Commands/Setting/UpdateAzKeyVaultSetting.cs b/src/KeyVault/KeyVault/Commands/Setting/UpdateAzKeyVaultSetting.cs
index 98cac3956bb3..d795240484a6 100644
--- a/src/KeyVault/KeyVault/Commands/Setting/UpdateAzKeyVaultSetting.cs
+++ b/src/KeyVault/KeyVault/Commands/Setting/UpdateAzKeyVaultSetting.cs
@@ -111,7 +111,10 @@ private void NormalizeParameterSets()
                     HsmName = HsmObject.VaultName; 
                     break;
                 case UpdateSettingViaInputObjectParameterSet:
-                    InputObject.HsmName = HsmName;
+                    if (this.IsParameterBound(c => c.HsmName))
+                    {
+                        InputObject.HsmName = HsmName;
+                    }
                     break;
             }
             if (!ParameterSetName.Equals(UpdateSettingViaInputObjectParameterSet))