diff --git a/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs b/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs
index 134db37afa..371428d988 100644
--- a/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs
+++ b/osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs
@@ -8,17 +8,18 @@ namespace osu.Game.Overlays.AccountCreation
 {
     public abstract class AccountCreationScreen : Screen
     {
-        protected AccountCreationScreen()
-        {
-            ValidForResume = false;
-        }
-
         protected override void OnEntering(Screen last)
         {
             base.OnEntering(last);
             Content.FadeOut().Delay(200).FadeIn(200);
         }
 
+        protected override void OnResuming(Screen last)
+        {
+            base.OnResuming(last);
+            Content.FadeIn(200);
+        }
+
         protected override void OnSuspending(Screen next)
         {
             base.OnSuspending(next);
diff --git a/osu.Game/Overlays/AccountCreationOverlay.cs b/osu.Game/Overlays/AccountCreationOverlay.cs
index 9f3470de21..9bc4119716 100644
--- a/osu.Game/Overlays/AccountCreationOverlay.cs
+++ b/osu.Game/Overlays/AccountCreationOverlay.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Overlays
     {
         private const float transition_time = 400;
 
+        private ScreenWelcome welcomeScreen;
+
         public AccountCreationOverlay()
         {
             Size = new Vector2(620, 450);
@@ -67,7 +69,7 @@ namespace osu.Game.Overlays
                                     Colour = Color4.Black,
                                     Alpha = 0.9f,
                                 },
-                                new ScreenWelcome(),
+                                welcomeScreen = new ScreenWelcome(),
                             }
                         }
                     }
@@ -79,6 +81,9 @@ namespace osu.Game.Overlays
         {
             base.PopIn();
             this.FadeIn(transition_time, Easing.OutQuint);
+
+            if (welcomeScreen.ChildScreen != null)
+                welcomeScreen.MakeCurrent();
         }
 
         protected override void PopOut()