diff --git a/pk3DS/Subforms/Gen6/GiftEditor6.cs b/pk3DS/Subforms/Gen6/GiftEditor6.cs
index a3797f8..7caaf32 100644
--- a/pk3DS/Subforms/Gen6/GiftEditor6.cs
+++ b/pk3DS/Subforms/Gen6/GiftEditor6.cs
@@ -231,12 +231,12 @@ private void B_RandAll_Click(object sender, EventArgs e)
                         continue; // skip Lucario, battle needs to Mega Evolve
 
                     int[] items = GetRandomMega(out species);
+                    NUD_Form.Value = 0;
                     CB_HeldItem.SelectedIndex = items[Util.rand.Next(0, items.Length)];
                 }
                 else
                 {
                     species = specrand.GetRandomSpecies(species);
-
                     if (CHK_Item.Checked)
                         CB_HeldItem.SelectedIndex = helditems[Util.rnd32() % helditems.Length];
                 }
@@ -244,9 +244,6 @@ private void B_RandAll_Click(object sender, EventArgs e)
                 if (CHK_AllowMega.Checked)
                     formrand.AllowMega = true;
 
-                if (MegaDictionary.Values.Any(z => z.Contains(CB_HeldItem.SelectedIndex)) && NUD_Form.Value > 0)
-                    NUD_Form.Value = 0; // don't allow Mega Stone Gifts to be form 1
-
                 if (CHK_RemoveShinyLock.Checked)
                     CHK_ShinyLock.Checked = false;
 
@@ -266,6 +263,9 @@ private void B_RandAll_Click(object sender, EventArgs e)
                 NUD_Form.Value = formrand.GetRandomForme(species);
                 CB_Gender.SelectedIndex = 0; // random
                 CB_Nature.SelectedIndex = 0; // random
+
+                if (MegaDictionary.Values.Any(z => z.Contains(CB_HeldItem.SelectedIndex)) && NUD_Form.Value != 0)
+                    NUD_Form.Value = 0; // don't allow mega gifts to be form 1
             }
             WinFormsUtil.Alert("Randomized all Gift Pokémon according to specification!");
         }
@@ -302,6 +302,8 @@ private int[] GetRandomMega(out int species)
             {310, new[] {682}}, // Manectric @ Manectite
             {354, new[] {668}}, // Banette @ Banettite
             {359, new[] {677}}, // Absol @ Absolite
+            {380, new[] {684}}, // Latias @ Latiasite
+            {381, new[] {685}}, // Latios @ Latiosite
             {445, new[] {683}}, // Garchomp @ Garchompite
             {448, new[] {673}}, // Lucario @ Lucarionite
             {460, new[] {674}}, // Abomasnow @ Abomasite
@@ -321,8 +323,6 @@ private int[] GetRandomMega(out int species)
             {362, new[] {763}}, // Glalie @ Glalitite
             {373, new[] {769}}, // Salamence @ Salamencite
             {376, new[] {758}}, // Metagross @ Metagrossite
-            {380, new[] {684}}, // Latias @ Latiasite
-            {381, new[] {685}}, // Latios @ Latiosite
             {428, new[] {768}}, // Lopunny @ Lopunnite
             {475, new[] {756}}, // Gallade @ Galladite
             {531, new[] {757}}, // Audino @ Audinite
diff --git a/pk3DS/Subforms/Gen6/RSTE.cs b/pk3DS/Subforms/Gen6/RSTE.cs
index 2576d46..95c9179 100644
--- a/pk3DS/Subforms/Gen6/RSTE.cs
+++ b/pk3DS/Subforms/Gen6/RSTE.cs
@@ -725,15 +725,14 @@ private static void InitializeTrainerTeamInfo(trdata6 t, bool important)
 
             // Copy the last slot to random pokemon
             int lastPKM = Math.Max(t.NumPokemon - 1, 0); // 0,1-6 => 0-5 (never is 0)
-
             t.NumPokemon = 6;
             Array.Resize(ref t.Team, t.NumPokemon);
             for (int f = lastPKM + 1; f < t.NumPokemon; f++)
             {
-                t.Team[f] = // clone last pkm then increment level by 1
+                t.Team[f] = // clone last pkm, keeping an average level for all 6
                     new trdata6.Pokemon(t.Team[lastPKM].Write(t.Item, t.Moves), t.Item, t.Moves)
                     {
-                        Level = (ushort) Math.Min(t.Team[f - 1].Level + 1, 100)
+                        Level = t.Team[f - 1].Level
                     };
             }
         }