diff --git a/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/CrossPoolMigrateCanMigrateFilter.cs b/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/CrossPoolMigrateCanMigrateFilter.cs
index dca6d1dc7..62ffebccc 100644
--- a/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/CrossPoolMigrateCanMigrateFilter.cs
+++ b/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/CrossPoolMigrateCanMigrateFilter.cs
@@ -96,7 +96,7 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard.Filters
                         {
                             //Skip the resident host as there's a filter for it and 
                             //if not then you could exclude intrapool migration
-                            if(vm.resident_on == host.opaque_ref)
+                            if (vm.Connection == host.Connection)
                                 continue;
 
                             PIF managementPif = host.Connection.Cache.PIFs.First(p => p.management);
diff --git a/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/ResidentHostIsSameAsSelectionFilter.cs b/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/ResidentHostIsSameAsSelectionFilter.cs
index bbdb3a9f5..2c50a0e9a 100644
--- a/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/ResidentHostIsSameAsSelectionFilter.cs
+++ b/XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/ResidentHostIsSameAsSelectionFilter.cs
@@ -54,7 +54,7 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard.Filters
             get
             {
                 List<Host> residentHosts = new List<Host>();
-                preSelectedVMs.ForEach(vm=>residentHosts.Add( vm.Connection.Resolve(vm.resident_on)));
+                preSelectedVMs.ForEach(vm=>residentHosts.Add(vm.Home()));
                 
                 if(ItemToFilterOn is Host)
                 {