diff --git a/src/main/kotlin/net/taehui/twilight/Utility.kt b/src/main/kotlin/net/taehui/twilight/Utility.kt
index e4039a1..14d6131 100644
--- a/src/main/kotlin/net/taehui/twilight/Utility.kt
+++ b/src/main/kotlin/net/taehui/twilight/Utility.kt
@@ -125,8 +125,8 @@
     }
 
     fun getAvatarLevel(avatarXP: Double): Int {
-        return (1.0 + if (avatarXP < 40000) {
-            avatarXP / 400.0
+        return (if (avatarXP < 90000) {
+            avatarXP / 900.0
         } else {
             sqrt(avatarXP) / 3
         }).toInt()
@@ -134,7 +134,7 @@
 
     fun getAvatarXP(avatarLevel: Int): Double {
         return if (avatarLevel < 100) {
-            avatarLevel * 400.0
+            avatarLevel * 900.0
         } else {
             (3.0 * avatarLevel).pow(2)
         }
diff --git a/src/main/kotlin/net/taehui/twilight/system/DB.kt b/src/main/kotlin/net/taehui/twilight/system/DB.kt
index a1d80ce..4b4703f 100644
--- a/src/main/kotlin/net/taehui/twilight/system/DB.kt
+++ b/src/main/kotlin/net/taehui/twilight/system/DB.kt
@@ -2876,7 +2876,7 @@
                     val avatarXP = if (rows.next()) rows.getDouble("Avatar_XP") else 0.0
                     val avatarLevel = Utility.getAvatarLevel(avatarXP)
                     val avatarXPNext = Utility.getAvatarXP(avatarLevel + 1)
-                    Triple(avatarLevel, avatarXPNext - Utility.getAvatarXP(avatarLevel), avatarXPNext - avatarXP)
+                    Triple(1 + avatarLevel, avatarXPNext - avatarXP, avatarXPNext - Utility.getAvatarXP(avatarLevel))
                 }
             }
         }
@@ -4210,7 +4210,7 @@
                             data.add(object {
                                 val avatarID = rows.getString("Avatar_ID")
                                 val avatarName = rows.getString("Avatar_Name")
-                                val value = Utility.getAvatarLevel(rows.getDouble("Avatar_XP"))
+                                val value = 1 + Utility.getAvatarLevel(rows.getDouble("Avatar_XP"))
                             })
                         }
                         data