diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index 699b79c..8286cc6 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -242,18 +242,15 @@ void Guild::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
 
 void Guild::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg)
 {
+    ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
+
     cs::SMGuildQuit respmsg;
-    #if 0
-    GuildMember* member = GetMember(context.user_info().base_data().account_id());
-    if (!member) {
-        return;
+    GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
+                                            forward_msg->context(),
+                                            respmsg);
+    GuildMember* sender = GetMember(forward_msg->context().user_info().base_data().account_id());
+    if (sender) {
     }
-    if (member->guild_job == kGuildOwner) {
-        return;
-    }
-    RemoveMember(member->account_id);
-    GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, context, respmsg);
-    #endif
 }
 
 void Guild::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)