diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 1d2912b..cabb9d0 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -43,6 +43,13 @@ class UserController extends BaseAuthedController {
 
     private function loginCheck($userInfo)
     {
+        $rankMeta = mt\Rank::get(1);
+        if ($rankMeta && $userInfo['rank'] < $rankMeta['rank']) {
+            $this->updateUserInfo(array(
+                 'rank' => $rankMeta['rank'],
+                 'score' => $rankMeta['min_score'],
+            ));
+        }
         return true;
     }
 
@@ -67,7 +74,7 @@ class UserController extends BaseAuthedController {
                  'head_frame' => 19003,
                  'level' => 100,
                  'exp' => 0,
-                 'rank' => $rankMeta ? $rankMeta['id'] : 0,
+                 'rank' => $rankMeta ? $rankMeta['rank'] : 0,
                  'score' => $rankMeta ? $rankMeta['min_score'] : 0,
                  'head_id' => 18001,
                  'hero_id' => 30100,
diff --git a/webapp/models/User.php b/webapp/models/User.php
index 0cb7593..18cc9c5 100644
--- a/webapp/models/User.php
+++ b/webapp/models/User.php
@@ -14,6 +14,8 @@ class User extends BaseModel {
             'head_frame' => $row['head_frame'],
             'level' => $row['level'],
             'exp' => $row['exp'],
+            'rank' => $row['rank'],
+            'score' => $row['score'],
             'gold' => $row['gold'],
             'diamond' => $row['diamond'],
             'hero_id' => $row['hero_id'],
@@ -31,6 +33,8 @@ class User extends BaseModel {
             'head_frame' => $row['head_frame'],
             'level' => $row['level'],
             'exp' => $row['exp'],
+            'rank' => $row['rank'],
+            'score' => $row['score'],
             'gold' => $row['gold'],
             'diamond' => $row['diamond'],
             'hero_id' => $row['hero_id'],