diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index ecb0443f33..5cfc24bdde 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -31,8 +31,8 @@ namespace osu.Game.Rulesets.Osu
 
         public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
         {
-            new KeyBinding(InputKey.A, OsuAction.LeftButton),
-            new KeyBinding(InputKey.S, OsuAction.RightButton),
+            new KeyBinding(InputKey.Z, OsuAction.LeftButton),
+            new KeyBinding(InputKey.X, OsuAction.RightButton),
             new KeyBinding(InputKey.MouseLeft, OsuAction.LeftButton),
             new KeyBinding(InputKey.MouseRight, OsuAction.RightButton),
         };
diff --git a/osu.Game.Tests/Visual/TestCaseDrawableDate.cs b/osu.Game.Tests/Visual/TestCaseDrawableDate.cs
new file mode 100644
index 0000000000..2e38f5eb28
--- /dev/null
+++ b/osu.Game.Tests/Visual/TestCaseDrawableDate.cs
@@ -0,0 +1,67 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseDrawableDate : OsuTestCase
+    {
+        public TestCaseDrawableDate()
+        {
+            Child = new FillFlowContainer
+            {
+                Direction = FillDirection.Vertical,
+                AutoSizeAxes = Axes.Both,
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Children = new Drawable[]
+                {
+                    new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(60))),
+                    new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(55))),
+                    new PokeyDrawableDate(DateTimeOffset.Now.Subtract(TimeSpan.FromSeconds(50))),
+                    new PokeyDrawableDate(DateTimeOffset.Now),
+                    new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(60))),
+                    new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(65))),
+                    new PokeyDrawableDate(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(70))),
+                }
+            };
+        }
+
+        private class PokeyDrawableDate : CompositeDrawable
+        {
+            public PokeyDrawableDate(DateTimeOffset date)
+            {
+                const float box_size = 10;
+
+                DrawableDate drawableDate;
+                Box flash;
+
+                AutoSizeAxes = Axes.Both;
+                InternalChildren = new Drawable[]
+                {
+                    flash = new Box
+                    {
+                        Colour = Color4.Yellow,
+                        Size = new Vector2(box_size),
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Alpha = 0
+                    },
+                    drawableDate = new DrawableDate(date)
+                    {
+                        X = box_size + 2,
+                    }
+                };
+
+                drawableDate.Current.ValueChanged += v => flash.FadeOutFromOne(500);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 3c7fe0b1eb..23739d8ad1 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Profile
                                             Y = -48,
                                             Children = new Drawable[]
                                             {
-                                                new OsuSpriteText
+                                                usernameText = new OsuSpriteText
                                                 {
                                                     Text = user.Username,
                                                     Font = @"Exo2.0-RegularItalic",
@@ -317,6 +317,8 @@ namespace osu.Game.Overlays.Profile
             levelBadge.Texture = textures.Get(@"Profile/levelbadge");
         }
 
+        private readonly OsuSpriteText usernameText;
+
         private User user;
 
         public User User
@@ -344,6 +346,8 @@ namespace osu.Game.Overlays.Profile
             if (user.IsSupporter)
                 SupporterTag.Show();
 
+            usernameText.Text = user.Username;
+
             if (!string.IsNullOrEmpty(user.Colour))
             {
                 colourBar.Colour = OsuColour.FromHex(user.Colour);