diff --git a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
index f929fbea..645ad85a 100644
--- a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
+++ b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
@@ -76,6 +76,16 @@ class AquaNetUser(
     var keychipSessions: MutableList<KeychipSession> = mutableListOf(),
 ) : Serializable {
     val computedName get() = displayName.ifEmpty { username }
+
+    val publicFields get() = mapOf(
+        "username" to username,
+        "displayName" to displayName,
+        "country" to country,
+        "regTime" to regTime,
+        "profileLocation" to profileLocation,
+        "profileBio" to profileBio,
+        "profilePicture" to profilePicture,
+    )
 }
 
 @Repository("AquaNetUserRepository")
diff --git a/src/main/java/icu/samnyan/aqua/net/games/Models.kt b/src/main/java/icu/samnyan/aqua/net/games/Models.kt
index e63adbc9..3b88f9a7 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/Models.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/Models.kt
@@ -2,7 +2,6 @@ package icu.samnyan.aqua.net.games
 
 import ext.API
 import ext.RP
-import icu.samnyan.aqua.net.db.AquaNetUser
 import icu.samnyan.aqua.net.utils.IGenericGamePlaylog
 
 data class TrendOut(val date: String, val rating: Int, val plays: Int)
@@ -13,7 +12,7 @@ data class GenericGameSummary(
     val name: String,
     val iconId: Int,
 
-    val aquaUser: AquaNetUser?,
+    val aquaUser: Map<String, Any?>?,
 
     val serverRank: Long,
     val accuracy: Double,
diff --git a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt b/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt
index ba6db167..10705f85 100644
--- a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt
+++ b/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt
@@ -105,7 +105,7 @@ fun genericUserSummary(
     return GenericGameSummary(
         name = user.userName,
         iconId = user.iconId,
-        aquaUser = card.aquaUser,
+        aquaUser = card.aquaUser?.publicFields,
         serverRank = userDataRepo.getRanking(user.playerRating),
         accuracy = plays.acc(),
         rating = user.playerRating,