diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index 3d65e7e4ba..437c5b07c9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -1,12 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Overlays;
+using osu.Game.Overlays.AccountCreation;
+using osu.Game.Overlays.Settings;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -36,8 +40,6 @@ namespace osu.Game.Tests.Visual.Online
         [BackgroundDependencyLoader]
         private void load()
         {
-            API.Logout();
-
             localUser = API.LocalUser.GetBoundCopy();
             localUser.BindValueChanged(user => { userPanelArea.Child = new UserGridPanel(user.NewValue) { Width = 200 }; }, true);
         }
@@ -46,11 +48,14 @@ namespace osu.Game.Tests.Visual.Online
         public void TestOverlayVisibility()
         {
             AddStep("start hidden", () => accountCreation.Hide());
-            AddStep("log out", API.Logout);
+            AddStep("log out", () => API.Logout());
 
             AddStep("show manually", () => accountCreation.Show());
             AddUntilStep("overlay is visible", () => accountCreation.State.Value == Visibility.Visible);
 
+            AddStep("click button", () => accountCreation.ChildrenOfType<SettingsButton>().Single().Click());
+            AddUntilStep("warning screen is present", () => accountCreation.ChildrenOfType<ScreenWarning>().SingleOrDefault()?.IsPresent == true);
+
             AddStep("log back in", () => API.Login("dummy", "password"));
             AddUntilStep("overlay is hidden", () => accountCreation.State.Value == Visibility.Hidden);
         }
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index b2096968fe..3d46e9ed94 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -23,14 +23,17 @@ namespace osu.Game.Overlays.AccountCreation
         private OsuTextFlowContainer multiAccountExplanationText;
         private LinkFlowContainer furtherAssistance;
 
-        [Resolved(CanBeNull = true)]
+        [Resolved(canBeNull: true)]
         private IAPIProvider api { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private OsuGame game { get; set; }
+
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
 
         public override void OnEntering(IScreen last)
         {
-            if (string.IsNullOrEmpty(api?.ProvidedUsername))
+            if (string.IsNullOrEmpty(api?.ProvidedUsername) || game?.UseDevelopmentServer == true)
             {
                 this.FadeOut();
                 this.Push(new ScreenEntry());
@@ -41,7 +44,7 @@ namespace osu.Game.Overlays.AccountCreation
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, OsuGame game, TextureStore textures)
+        private void load(OsuColour colours, TextureStore textures)
         {
             if (string.IsNullOrEmpty(api?.ProvidedUsername))
                 return;