diff --git a/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs b/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs
index 1bb72a5ab4..ec70253118 100644
--- a/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs
+++ b/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs
@@ -63,8 +63,8 @@ namespace osu.Game.Tests.Visual
                         {
                             Value = new[]
                             {
-                                new User { GlobalRank = 1355 },
-                                new User { GlobalRank = 8756 },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 1355 } } },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 8756 } } },
                             },
                         },
                     }),
@@ -99,10 +99,10 @@ namespace osu.Game.Tests.Visual
                         },
                         Participants =
                         {
-                            Value =  new[]
+                            Value = new[]
                             {
-                                new User { GlobalRank = 578975 },
-                                new User { GlobalRank = 24554 },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 578975 } } },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 24554 } } },
                             },
                         },
                     }),
@@ -116,8 +116,8 @@ namespace osu.Game.Tests.Visual
             AddStep(@"change beatmap", () => first.Room.Beatmap.Value = null);
             AddStep(@"change participants", () => first.Room.Participants.Value = new[]
             {
-                new User { GlobalRank = 1254 },
-                new User { GlobalRank = 123189 },
+                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 1254 } } },
+                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 123189 } } },
             });
         }
 
diff --git a/osu.Game.Tests/Visual/TestCaseRankGraph.cs b/osu.Game.Tests/Visual/TestCaseRankGraph.cs
index 54930c51a2..88631aa982 100644
--- a/osu.Game.Tests/Visual/TestCaseRankGraph.cs
+++ b/osu.Game.Tests/Visual/TestCaseRankGraph.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 123456,
+                        Ranks = new UserStatistics.UserRanks { Global = 123456 },
                         PP = 12345,
                     }
                 };
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 89000,
+                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
                         PP = 12345,
                     },
                     RankHistory = new User.RankHistoryData
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 89000,
+                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
                         PP = 12345,
                     },
                     RankHistory = new User.RankHistoryData
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 12000,
+                        Ranks = new UserStatistics.UserRanks { Global = 12000 },
                         PP = 12345,
                     },
                     RankHistory = new User.RankHistoryData
diff --git a/osu.Game.Tests/Visual/TestCaseRoomInspector.cs b/osu.Game.Tests/Visual/TestCaseRoomInspector.cs
index e613d87500..8c4aa02a68 100644
--- a/osu.Game.Tests/Visual/TestCaseRoomInspector.cs
+++ b/osu.Game.Tests/Visual/TestCaseRoomInspector.cs
@@ -54,12 +54,12 @@ namespace osu.Game.Tests.Visual
                 {
                     Value = new[]
                     {
-                        new User { Username = @"flyte", Id = 3103765, GlobalRank = 1425 },
-                        new User { Username = @"Cookiezi", Id = 124493, GlobalRank = 5466 },
-                        new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 2873 },
-                        new User { Username = @"Rafis", Id = 2558286, GlobalRank = 4687 },
-                        new User { Username = @"hvick225", Id = 50265, GlobalRank = 3258 },
-                        new User { Username = @"peppy", Id = 2, GlobalRank = 6251 }
+                        new User { Username = @"flyte", Id = 3103765, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 142 } } },
+                        new User { Username = @"Cookiezi", Id = 124493, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 546 } } },
+                        new User { Username = @"Angelsim", Id = 1777162, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 287 } } },
+                        new User { Username = @"Rafis", Id = 2558286, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 468 } } },
+                        new User { Username = @"hvick225", Id = 50265, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 325 } } },
+                        new User { Username = @"peppy", Id = 2, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 625 } } },
                     }
                 }
             };
@@ -80,8 +80,8 @@ namespace osu.Game.Tests.Visual
             AddStep(@"change max participants", () => room.MaxParticipants.Value = null);
             AddStep(@"change participants", () => room.Participants.Value = new[]
             {
-                new User { Username = @"filsdelama", Id = 2831793, GlobalRank = 8542 },
-                new User { Username = @"_index", Id = 652457, GlobalRank = 15024 }
+                new User { Username = @"filsdelama", Id = 2831793, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 854 } } },
+                new User { Username = @"_index", Id = 652457, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 150 } } }
             });
 
             AddStep(@"change room", () =>
@@ -121,9 +121,9 @@ namespace osu.Game.Tests.Visual
                     {
                         Value = new[]
                         {
-                            new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 4 },
-                            new User { Username = @"HappyStick", Id = 256802, GlobalRank = 752 },
-                            new User { Username = @"-Konpaku-", Id = 2258797, GlobalRank = 571 }
+                            new User { Username = @"Angelsim", Id = 1777162, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 4 } } },
+                            new User { Username = @"HappyStick", Id = 256802, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 752 } } },
+                            new User { Username = @"-Konpaku-", Id = 2258797, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 571 } } }
                         }
                     }
                 };
diff --git a/osu.Game.Tests/Visual/TestCaseUserProfile.cs b/osu.Game.Tests/Visual/TestCaseUserProfile.cs
index 2c3abe0049..8acc8d1b5b 100644
--- a/osu.Game.Tests/Visual/TestCaseUserProfile.cs
+++ b/osu.Game.Tests/Visual/TestCaseUserProfile.cs
@@ -44,10 +44,9 @@ namespace osu.Game.Tests.Visual
                 ProfileOrder = new[] { "me" },
                 Statistics = new UserStatistics
                 {
-                    Rank = 2148,
-                    PP = 4567.89m
+                    Ranks = new UserStatistics.UserRanks { Global = 2148, Country = 1 },
+                    PP = 4567.89m,
                 },
-                CountryRank = 1,
                 RankHistory = new User.RankHistoryData
                 {
                     Mode = @"osu",
diff --git a/osu.Game/Overlays/Profile/RankGraph.cs b/osu.Game/Overlays/Profile/RankGraph.cs
index 9d3183339e..e7e253df7c 100644
--- a/osu.Game/Overlays/Profile/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/RankGraph.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Overlays.Profile
                 return;
             }
 
-            int[] userRanks = user.RankHistory?.Data ?? new[] { user.Statistics.Rank };
+            int[] userRanks = user.RankHistory?.Data ?? new[] { user.Statistics.Ranks.Global };
             ranks = userRanks.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
 
             if (ranks.Length > 1)
@@ -124,9 +124,9 @@ namespace osu.Game.Overlays.Profile
 
         private void updateRankTexts()
         {
-            rankText.Text = User.Value.Statistics.Rank > 0 ? $"#{User.Value.Statistics.Rank:#,0}" : "no rank";
+            rankText.Text = User.Value.Statistics.Ranks.Global > 0 ? $"#{User.Value.Statistics.Ranks.Global:#,0}" : "no rank";
             performanceText.Text = User.Value.Statistics.PP != null ? $"{User.Value.Statistics.PP:#,0}pp" : string.Empty;
-            relativeText.Text = $"{User.Value.Country?.FullName} #{User.Value.CountryRank:#,0}";
+            relativeText.Text = $"{User.Value.Country?.FullName} #{User.Value.Statistics.Ranks.Country:#,0}";
         }
 
         private void showHistoryRankTexts(int dayIndex)
diff --git a/osu.Game/Screens/Multiplayer/ParticipantInfo.cs b/osu.Game/Screens/Multiplayer/ParticipantInfo.cs
index ff00f53600..0fd4f4d08d 100644
--- a/osu.Game/Screens/Multiplayer/ParticipantInfo.cs
+++ b/osu.Game/Screens/Multiplayer/ParticipantInfo.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Multiplayer
         {
             set
             {
-                var ranks = value.Select(u => u.GlobalRank);
+                var ranks = value.Select(u => u.Statistics.Ranks.Global);
                 levelRangeLower.Text = ranks.Min().ToString();
                 levelRangeHigher.Text = ranks.Max().ToString();
             }
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 46c5d9e282..777eb7beca 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -26,18 +26,6 @@ namespace osu.Game.Users
         [JsonProperty(@"age")]
         public int? Age;
 
-        public int GlobalRank
-        {
-            get => Statistics?.Ranks.GlobalRank ?? 0;
-            set => Statistics.Ranks.GlobalRank = value;
-        }
-
-        public int CountryRank
-        {
-            get => Statistics?.Ranks.CountryRank ?? 0;
-            set => Statistics.Ranks.CountryRank = value;
-        }
-
         //public Team Team;
 
         [JsonProperty(@"profile_colour")]
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 48012b089b..863293d847 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -23,23 +23,10 @@ namespace osu.Game.Users
         public decimal? PP;
 
         [JsonProperty(@"pp_rank")]
-        public int Rank
-        {
-            get => Ranks.GlobalRank ?? 0;
-            set => Ranks.GlobalRank = value;
-        }
+        private int rank { set => Ranks.Global = value; }
 
         [JsonProperty(@"rank")]
-        public UserRank Ranks;
-
-        public struct UserRank
-        {
-            [JsonProperty(@"global")]
-            public int? GlobalRank;
-
-            [JsonProperty(@"country")]
-            public int? CountryRank;
-        }
+        public UserRanks Ranks;
 
         [JsonProperty(@"ranked_score")]
         public long RankedScore;
@@ -82,5 +69,15 @@ namespace osu.Game.Users
             [JsonProperty(@"a")]
             public int A;
         }
+
+        public struct UserRanks
+        {
+            [JsonProperty(@"global")]
+            public int Global;
+
+            [JsonProperty(@"country")]
+            public int Country;
+        }
+
     }
 }