diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabAbout.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabAbout.cs
index 77312951..a58992fb 100644
--- a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabAbout.cs
+++ b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabAbout.cs
@@ -47,12 +47,6 @@ public override void Draw()
             PlatformHelpers.OpenBrowser(Path.Combine(AppContext.BaseDirectory, "license.txt"));
         }
 
-        if (ImGui.Button("Generate Troubleshooting Pack"))
-        {
-            PackGenerator.SavePack(Program.storage);
-            PlatformHelpers.OpenBrowser(Program.storage.GetFolder("logs").FullName);
-        }
-
         base.Draw();
     }
 }
\ No newline at end of file
diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs
index 0362c5e3..ccea203d 100644
--- a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs
+++ b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabGame.cs
@@ -33,13 +33,13 @@ public class SettingsTabGame : SettingsTab
             CheckWarning = x => !x ? "DirectX 9 is no longer supported by the game or Dalamud. Things may not work." : null
         },
 
-        new SettingsEntry<string>("Additional Arguments", "Follows Steam conventions: VAR1=value VAR2=value %command% -arg1 -arg2.\nCan't pass programs (like gamescope -- %command%). Does not accept flatpak args (--parent-pid=1, etc.)", () => Program.Config.AdditionalArgs, x => Program.Config.AdditionalArgs = x),
+        new SettingsEntry<string>("Additional Game Arguments", "Follows Steam conventions: VAR1=value VAR2=value %command% -arg1 -arg2.\nCan't pass programs (like gamescope -- %command%). Does not accept flatpak args (--parent-pid=1, etc.)", () => Program.Config.AdditionalArgs, x => Program.Config.AdditionalArgs = x),
         new SettingsEntry<ClientLanguage>("Game Language", "Select the game's language.", () => Program.Config.ClientLanguage ?? ClientLanguage.English, x => Program.Config.ClientLanguage = x),
         new SettingsEntry<DpiAwareness>("Game DPI Awareness", "Select the game's DPI Awareness. Change this if the game's scaling looks wrong.", () => Program.Config.DpiAwareness ?? DpiAwareness.Unaware, x => Program.Config.DpiAwareness = x),
         new SettingsEntry<bool>("Free Trial Account", "Check this if you are using a free trial account.", () => Program.Config.IsFt ?? false, x => Program.Config.IsFt = x),
         new SettingsEntry<bool>("Use XIVLauncher authenticator/OTP macros", "Check this if you want to use the XIVLauncher authenticator app or macros.", () => Program.Config.IsOtpServer ?? false, x => Program.Config.IsOtpServer = x),
         new SettingsEntry<bool>("Ignore Steam", "Check this if you do not want XIVLauncher to communicate with Steam (Requires Restart).", () => Program.Config.IsIgnoringSteam ?? false, x => Program.Config.IsIgnoringSteam = x),
-        new SettingsEntry<bool>("Use UID Cache", "Tries to save your login token for the next start.", () => Program.Config.IsUidCacheEnabled ?? false, x => Program.Config.IsUidCacheEnabled = x),
+        new SettingsEntry<bool>("Use Experimental UID Cache", "Tries to save your login token for the next start. Can result in launching with expired sessions.\nDisable if receiving FFXIV error 1012 or 500X.", () => Program.Config.IsUidCacheEnabled ?? false, x => Program.Config.IsUidCacheEnabled = x),
     };
 
     public override string Title => "Game";
diff --git a/src/XIVLauncher.Core/Support/Troubleshooting.cs b/src/XIVLauncher.Core/Support/Troubleshooting.cs
index e2263892..8c3cbdcb 100644
--- a/src/XIVLauncher.Core/Support/Troubleshooting.cs
+++ b/src/XIVLauncher.Core/Support/Troubleshooting.cs
@@ -117,7 +117,7 @@ internal static string GetTroubleshootingJson()
                 EncryptArguments = Program.Config.IsEncryptArgs.GetValueOrDefault(true),
                 LauncherVersion = AppUtil.GetAssemblyVersion(),
                 LauncherHash = AppUtil.GetGitHash() ?? "<unavailable>",
-                Official = AppUtil.GetBuildOrigin() == "goatcorp/FFXIVQuickLauncher",
+                Official = AppUtil.GetBuildOrigin() == "goatcorp/XIVLauncher.Core",
                 DpiAwareness = Program.Config.DpiAwareness.GetValueOrDefault(),
                 Platform = PlatformHelpers.GetPlatform(),