diff --git a/src/main/java/icu/samnyan/aqua/net/Bot.kt b/src/main/java/icu/samnyan/aqua/net/Bot.kt
index 96b9b8d6..07f451bb 100644
--- a/src/main/java/icu/samnyan/aqua/net/Bot.kt
+++ b/src/main/java/icu/samnyan/aqua/net/Bot.kt
@@ -54,13 +54,29 @@ class BotController(
 
         // 1. Check if the card exist
         var cards = listOfNotNull(
-            us.cardRepo.findByExtId(cardId.long)(),
             us.cardRepo.findByLuid(cardId)(),
-            us.cardRepo.findById(cardId.long)(),
         ).mut
+
+        cardId.toLongOrNull()?.let {
+            cards += listOfNotNull(
+                us.cardRepo.findById(it)(),
+                us.cardRepo.findByExtId(it)(),
+            )
+
+            cards += listOfNotNull(
+                us.userRepo.findByAuId(it)?.cards,
+            ).flatten()
+        }
+
+        cards += listOfNotNull(
+            us.userRepo.findByEmailIgnoreCase(cardId)?.cards,
+            us.userRepo.findByUsernameIgnoreCase(cardId)?.cards,
+        ).flatten()
+
         cards += cards.flatMap {
             (it.aquaUser?.cards ?: emptyList()) + listOfNotNull(it.aquaUser?.ghostCard)
         }
+
         cards = cards.distinctBy { it.id }.mut
 
         return cards.map { card ->
diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
index f06cce0d..69979bc3 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
@@ -90,6 +90,8 @@ class Maimai2(
             "iconId" to userData.iconId,
             "plateId" to userData.plateId,
             "titleId" to userData.titleId,
+            "frameId" to userData.frameId,
+            "partnerId" to userData.partnerId,
             "classRank" to userData.classRank,
             "playerRating" to userData.playerRating,
             "userName" to userData.userName,