diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 7155c73..b6ddaf2 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -2828,9 +2828,11 @@ bool Creature::CanFollow(Creature* follower)
     if (follower->GetUniId() == GetUniId()) {
         return false;
     }
+    #if 0
     if (!follower->IsPlayer()) {
         return false;
     }
+    #endif
     if (follower->team_id != team_id) {
         return false;
     }
@@ -2846,9 +2848,11 @@ bool Creature::CanFollow(Creature* follower)
         return false;
     }
 
+    #if 0
     if (!IsPlayer()) {
         return false;
     }
+    #endif
     if (HasBuffEffect(kBET_Jump)) {
         return false;
     }
diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 0c86519..52a6d87 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -256,6 +256,9 @@ void MatchTeam::UpdateMaster()
                 for (int i = 0; i < 4; ++i) {
                     AutoChoose(true);
                 }
+                for (auto& member : curr_member_hash_) {
+                    member->state = kMatchPrepare;
+                }
                 phase_ = kMatchLock;
                 phase_start_tick_ = a8::XGetTickCount();
                 countdown_ = MetaMgr::Instance()->match_lock_time;