diff --git a/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateHCIReplicationInfrastructure.ps1 b/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateHCIReplicationInfrastructure.ps1
index 85665ec5cc72..32b802e90dfe 100644
--- a/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateHCIReplicationInfrastructure.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/Initialize-AzMigrateHCIReplicationInfrastructure.ps1
@@ -161,7 +161,13 @@ function Initialize-AzMigrateHCIReplicationInfrastructure {
         }
 
         if (-not $userObject) {
-            $userObject = Get-AzADServicePrincipal -ApplicationID $context.Account.Id
+            if ($context.Account.Id.StartsWith("MSI@")) {
+                $hostname = $env:COMPUTERNAME
+                $userObject = Get-AzADServicePrincipal -DisplayName $hostname
+            }
+            else {
+                $userObject = Get-AzADServicePrincipal -ApplicationID $context.Account.Id
+            }
         }
 
         if (-not $userObject) {
diff --git a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateHCIServerReplication.ps1 b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateHCIServerReplication.ps1
index c9572169ee9b..df8a3f9ebbdd 100644
--- a/src/Migrate/Migrate.Autorest/custom/New-AzMigrateHCIServerReplication.ps1
+++ b/src/Migrate/Migrate.Autorest/custom/New-AzMigrateHCIServerReplication.ps1
@@ -386,6 +386,14 @@ function New-AzMigrateHCIServerReplication {
         $customProperties.TargetCpuCore = if ($HasTargetVMCPUCore) { $TargetVMCPUCore } else { $machine.NumberOfProcessorCore }
         $customProperties.IsDynamicRam = if ($HasIsDynamicMemoryEnabled) { $isDynamicRamEnabled } else {  $isSourceDynamicMemoryEnabled }
     
+        # Determine target VM Hyper-V Generation
+        if ($SiteType -eq $SiteTypes.HyperVSites) { # Hyper-V
+            $customProperties.HyperVGeneration = $machine.Generation
+        }
+        else { # VMware
+            $customProperties.HyperVGeneration = if ($machine.Firmware -eq "BIOS") { "1" } else { "2" }
+        }
+
         # Validate TargetVMRam
         if ($HasTargetVMRam) {
             # TargetVMRam needs to be greater than 0