diff --git a/TaikoWebUI/Pages/AccessCode.razor.cs b/TaikoWebUI/Pages/AccessCode.razor.cs
index a48009e..8c51583 100644
--- a/TaikoWebUI/Pages/AccessCode.razor.cs
+++ b/TaikoWebUI/Pages/AccessCode.razor.cs
@@ -43,15 +43,7 @@ public partial class AccessCode
 
     private async Task InitializeUser()
     {
-        if (!AuthService.LoginRequired)
-        {
-            var users = await Client.GetFromJsonAsync<List<User>>("api/Users");
-            if (users != null) User = users.FirstOrDefault(u => u.Baid == Baid);
-        }
-        else if (AuthService.IsLoggedIn)
-        {
-            User = await Client.GetFromJsonAsync<User>($"api/Users/{Baid}");
-        }
+        User = await Client.GetFromJsonAsync<User>($"api/Users/{Baid}");
     }
 
     private async Task DeleteAccessCode(string accessCode)
diff --git a/TaikoWebUI/Pages/Users.razor b/TaikoWebUI/Pages/Users.razor
index 2c5f9b5..d7c9106 100644
--- a/TaikoWebUI/Pages/Users.razor
+++ b/TaikoWebUI/Pages/Users.razor
@@ -9,11 +9,11 @@
 <MudText Typo="Typo.h4">@Localizer["Users"]</MudText>
 <MudGrid Class="my-8">
     @if (!AuthService.LoginRequired || (AuthService.LoginRequired && AuthService.IsAdmin)) {
-        if (isLoading == true)
+        if (isLoading == true || response == null)
         {
             // Loading...
-            for (uint i = 0; i < 6; i++) {
-                <MudItem xs="12" md="6" lg="4">
+            for (uint i = 0; i < pageSize; i++) {
+                <MudItem xs="12" md="6" lg="4" xl="3">
                     <MudCard Outlined="true">
                         <MudCardContent>
                             <MudSkeleton Width="30%" Height="42px;" Class="mb-5" />
@@ -32,7 +32,7 @@
         } else if (response.Users.Count > 0) {
             foreach (var user in response.Users)
             {
-                <MudItem xs="12" md="6" lg="4">
+                <MudItem xs="12" md="6" lg="4" xl="3">
                     <UserCard User="user" UserSetting="user.UserSetting" />
                 </MudItem>
             }