diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 7c1f620c93..3deb447a9f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -117,7 +117,7 @@ protected override void Dispose(bool isDisposing)
             //refresh token may have changed.
             if (Config != null && API != null)
             {
-                Config.Set(OsuConfig.Token, API.Token);
+                Config.Set(OsuConfig.Token, Config.Get<bool>(OsuConfig.SavePassword) ? API.Token : string.Empty);
                 Config.Save();
             }