diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 2c5c53cc3f..380af878a8 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -152,8 +152,6 @@ namespace osu.Game.Configuration
             Set(OsuConfig.HiddenShowFirstApproach, true);
             Set(OsuConfig.ComboColourSliderBall, true);
             Set(OsuConfig.AlternativeChatFont, false);
-            Set(OsuConfig.Password, string.Empty);
-            Set(OsuConfig.Username, string.Empty);
             Set(OsuConfig.DisplayStarsMaximum, 10.0, 0.0, 10.0);
             Set(OsuConfig.DisplayStarsMinimum, 0.0, 0.0, 10.0);
             Set(OsuConfig.AudioDevice, string.Empty);
diff --git a/osu.Game/Overlays/Options/General/LoginOptions.cs b/osu.Game/Overlays/Options/General/LoginOptions.cs
index 9939a00177..e5de055f32 100644
--- a/osu.Game/Overlays/Options/General/LoginOptions.cs
+++ b/osu.Game/Overlays/Options/General/LoginOptions.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Overlays.Options.General
         private void performLogout()
         {
             api.Logout();
+            //TODO: set null strings in username, password, token
         }
 
         public void APIStateChanged(APIAccess api, APIState state)