diff --git a/server/gameserver/guide.cc b/server/gameserver/guide.cc
index 50bbafa6..64b5b446 100644
--- a/server/gameserver/guide.cc
+++ b/server/gameserver/guide.cc
@@ -367,6 +367,7 @@ void Guide::NextStep()
 #endif
     ++curr_step_idx_;
     if (curr_step_idx_ >= mt::GuideStep::_steps.size()) {
+        finished_ = true;
         owner_->room->frame_event.AddPropChg
             (
              owner_->GetWeakPtrRef(),
diff --git a/server/gameserver/guide.h b/server/gameserver/guide.h
index 69509ff3..64d58a93 100644
--- a/server/gameserver/guide.h
+++ b/server/gameserver/guide.h
@@ -23,9 +23,11 @@ class Guide
     void ProcUseSkill();
 
     void NextStep();
+    bool IsFinished() { return finished_; };
 
  private:
     Human* owner_ = nullptr;
+    bool finished_ = false;
     int curr_step_idx_ = 0;
     const mt::GuideStep* curr_step_meta_ = nullptr;
 };
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 994d7be9..ff1871eb 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -486,6 +486,7 @@ void Room::FillSMJoinedNotify(Player* self_hum, cs::SMJoinedNotify& msg)
 {
     msg.set_team_mode(msg.team_mode());
     msg.set_adjust_bullet(1);
+    msg.set_is_newbie_room(IsNewBieRoom() ? 1 : 0);
 }
 
 void Room::ScatterDrop(const glm::vec3& center, int drop_id)