diff --git a/client.go b/client.go
index da930ca..ee2870c 100644
--- a/client.go
+++ b/client.go
@@ -53,11 +53,11 @@ func clientMsgMeAck(m *ChatWarsMessageMeAck) {
 	if clt, ok := getLockedClient(m.Msg.TGUserID64, false); ok {
 		if clt.Active {
 			if clt.CWLastUpdate.Before(m.Msg.Date) {
-				clt.CWGuildID64 = m.GuildID64
-				clt.CWUserID64 = m.UserID64
+				clt.CWGuildID64 = m.CWGuildID64
+				clt.CWUserID64 = m.CWUserID64
 				clt.CWState = m.State
 				clt.CWLastUpdate = m.Msg.Date
-				if getObjGuildID(``) != m.GuildID64 && strings.Compare(clt.CWRole, ``) == 0 {
+				if getObjGuildID(``) != m.CWGuildID64 && strings.Compare(clt.CWRole, ``) == 0 {
 					clientSendCWMsg(m.Msg.TGUserID64, "/g_roles")
 				}
 			}
diff --git a/obj.go b/obj.go
index 9bbbcc0..b00aa11 100644
--- a/obj.go
+++ b/obj.go
@@ -122,7 +122,7 @@ func addObjMsg(msgID64 int64, msgChatID64 int64, msgTGUserID64 int64, msgTGSende
 	m := new(ChatWarsMessage)
 	m.ObjID64 = objId
 	m.TGUserID64 = msgTGUserID64
-	m.SenderUserID64 = msgTGSenderUserID64
+	m.TGSenderUserID64 = msgTGSenderUserID64
 	m.Date = msgDate
 	m.ID64 = msgID64
 	m.ChatID64 = msgChatID64