diff --git a/PKHeX.Core/PKM/PB7.cs b/PKHeX.Core/PKM/PB7.cs
index 65e92c600..3a670bd3a 100644
--- a/PKHeX.Core/PKM/PB7.cs
+++ b/PKHeX.Core/PKM/PB7.cs
@@ -335,12 +335,12 @@ namespace PKHeX.Core
 
         protected override void TradeHT(string SAV_Trainer, int SAV_COUNTRY, int SAV_REGION, int SAV_GENDER, bool Bank)
         {
-            CurrentHandler = 1;
             if (HT_Name != SAV_Trainer)
             {
                 HT_Friendship = CurrentFriendship; // PersonalInfo.BaseFriendship;
                 HT_Affection = 0;
             }
+            CurrentHandler = 1;
             HT_Name = SAV_Trainer;
             HT_Gender = SAV_GENDER;
         }
diff --git a/PKHeX.Core/Saves/SAV7b.cs b/PKHeX.Core/Saves/SAV7b.cs
index d7fb36544..bd31ee8f4 100644
--- a/PKHeX.Core/Saves/SAV7b.cs
+++ b/PKHeX.Core/Saves/SAV7b.cs
@@ -151,7 +151,7 @@ namespace PKHeX.Core
             // Apply to this Save File
             int CT = pk.CurrentHandler;
             var Date = DateTime.Now;
-            pk.Trade(OT, TID, SID, Gender, Date.Day, Date.Month, false, Date.Year);
+            pk.Trade(OT, TID, SID, 0, 0, Gender, false, Date.Day, Date.Month, Date.Year);
             if (CT != pk.CurrentHandler) // Logic updated Friendship
             {
                 // Copy over the Friendship Value only under certain circumstances