diff --git a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs
index 5886243..1f861a2 100644
--- a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs
+++ b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs
@@ -28,7 +28,7 @@ public class AccountLoggedIn : MonoBehaviour
         loggedInRefreshLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(6));
         loggedInLogoutButton.onClick.AddListener(() =>
         {
-            accountLoggedOut.clearValues = true;
+            BazookaManager.Instance.ResetSave();
             AccountHandler.instance.SwitchPanel(1);
         });
         loggedInBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
diff --git a/Assets/Scripts/AccountMenu/AccountLoggedOut.cs b/Assets/Scripts/AccountMenu/AccountLoggedOut.cs
index 69d34a7..1818513 100644
--- a/Assets/Scripts/AccountMenu/AccountLoggedOut.cs
+++ b/Assets/Scripts/AccountMenu/AccountLoggedOut.cs
@@ -7,7 +7,6 @@ public class AccountLoggedOut : MonoBehaviour
     public Button loggedOutLoginButton;
     public Button loggedOutRegisterButton;
     public Button loggedOutBackButton;
-    public bool clearValues = false;
 
     void Awake()
     {
@@ -15,26 +14,4 @@ public class AccountLoggedOut : MonoBehaviour
         loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(3));
         loggedOutBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
     }
-
-    void OnEnable()
-    {
-        if (clearValues)
-        {
-            BazookaManager.Instance.UnsetAccountSession();
-            BazookaManager.Instance.UnsetAccountName();
-            BazookaManager.Instance.UnsetAccountID();
-            BazookaManager.Instance.UnsetGameStoreHighScore();
-            BazookaManager.Instance.UnsetBirdIcon();
-            BazookaManager.Instance.UnsetBirdOverlay();
-            BazookaManager.Instance.UnsetGameStoreTotalNormalBerries();
-            BazookaManager.Instance.UnsetGameStoreTotalPoisonBerries();
-            BazookaManager.Instance.UnsetGameStoreTotalSlowBerries();
-            BazookaManager.Instance.UnsetGameStoreTotalUltraBerries();
-            BazookaManager.Instance.UnsetGameStoreTotalSpeedyBerries();
-            BazookaManager.Instance.UnsetGameStoreTotalAttepts();
-            BazookaManager.Instance.UnsetColorSettingIcon();
-            BazookaManager.Instance.UnsetColorSettingOverlay();
-            clearValues = false;
-        }
-    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/BazookaManager.cs b/Assets/Scripts/BazookaManager.cs
index ab8b3a9..3fcf353 100644
--- a/Assets/Scripts/BazookaManager.cs
+++ b/Assets/Scripts/BazookaManager.cs
@@ -1,8 +1,6 @@
 using System.IO;
 using System.Numerics;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Unity.VisualScripting;
 using UnityEngine;
 
 public class BazookaManager : MonoBehaviour
@@ -69,7 +67,7 @@ public class BazookaManager : MonoBehaviour
         return;
 #else
         string path = Path.Join(Application.persistentDataPath, SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY + ".dat");
-        var encoded = SensitiveInfo.EncryptRaw(saveFile.ToString(Formatting.None), SensitiveInfo.BAZOOKA_MANAGER_KEY);
+        var encoded = SensitiveInfo.EncryptRaw(saveFile.ToString(Newtonsoft.Json.Formatting.None), SensitiveInfo.BAZOOKA_MANAGER_KEY);
         if (encoded == null) return;
         using var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None);
         fileStream.Write(encoded, 0, encoded.Length);
@@ -77,6 +75,12 @@ public class BazookaManager : MonoBehaviour
 #endif
     }
 
+    public void ResetSave()
+    {
+        saveFile = new JObject();
+        Save();
+    }
+
     //Bird stuff
 
     public void SetBirdIcon(int value)