diff --git a/Misc/SAV6.cs b/Misc/SAV6.cs
index 0287d8756..b1708800c 100644
--- a/Misc/SAV6.cs
+++ b/Misc/SAV6.cs
@@ -77,7 +77,7 @@ public void getSAVOffsets()
                     LastViewedBox = PCLayout = PCBackgrounds = PCFlags = WondercardFlags = WondercardData = 
                     BerryField = OPower = Accessories = 
                     PokeDex = PokeDexLanguageFlags = Spinda = EncounterCount = HoF = PSS = JPEG = Contest -1;
-                MaisonStats = 0; // Make things work?
+                MaisonStats = -1;
             }
             else if (XY)
             {
diff --git a/SAV/SAV_Trainer.cs b/SAV/SAV_Trainer.cs
index 6987f50ec..c591ff2a4 100644
--- a/SAV/SAV_Trainer.cs
+++ b/SAV/SAV_Trainer.cs
@@ -33,10 +33,9 @@ public SAV_Trainer()
             if (!SAV.XY)
                 TC_Editor.TabPages.Remove(Tab_Appearance);
             if (SAV.ORASDEMO)
-            {
-                TC_Editor.TabPages.Remove(Tab_Maison);
                 TC_Editor.TabPages.Remove(Tab_Multiplayer);
-            }
+            if (SAV.MaisonStats < 0)
+                TC_Editor.TabPages.Remove(Tab_Maison);
 
             editing = true;
             getComboBoxes();
@@ -388,8 +387,9 @@ private void getTextBoxes()
             CB_Language.SelectedValue = SAV.Language;
 
             // Maison Data
-            for (int i = 0; i < MaisonRecords.Length; i++)
-                MaisonRecords[i].Text = SAV.getMaisonStat(i).ToString();
+            if (SAV.MaisonStats > -1)
+                for (int i = 0; i < MaisonRecords.Length; i++)
+                    MaisonRecords[i].Text = SAV.getMaisonStat(i).ToString();
 
             NUD_M.Value = SAV.M;
             // Sanity Check Map Coordinates
@@ -471,8 +471,9 @@ private void save()
             SAV.Saying5 = TB_Saying5.Text;
 
             // Copy Maison Data in
-            for (int i = 0; i < MaisonRecords.Length; i++)
-                SAV.setMaisonStat(i, ushort.Parse(MaisonRecords[i].Text));
+            if (SAV.MaisonStats > -1)
+                for (int i = 0; i < MaisonRecords.Length; i++)
+                    SAV.setMaisonStat(i, ushort.Parse(MaisonRecords[i].Text));
 
             // Copy Position
             if (GB_Map.Enabled)