diff --git a/lib/chat_manager.gd b/lib/chat_manager.gd
index 2dc679bb..6c6d1274 100644
--- a/lib/chat_manager.gd
+++ b/lib/chat_manager.gd
@@ -37,12 +37,16 @@ func _handle_message(message: TwitchChatMessage) -> void:
 		chatter = Globals.context.chatters.find_one(Condition.new().equal("twitch_id", id))
 		if not chatter:
 			chatter = Chatter.new()
-			chatter.twitch_id = id
-			chatter.first_seen = Time.get_unix_time_from_system()
-			chatter.last_seen = chatter.first_seen
+			chatter.twitch_id = user.id
+			chatter.user = user
+			chatter.first_added = Time.get_unix_time_from_system()
+			chatter.first_seen = chatter.first_added
+			chatter.last_seen = chatter.first_added
 			Globals.context.chatters.append(chatter)
 			first_seen = true
 		else:
+			if chatter.first_seen == -1.0:
+				chatter.first_seen = Time.get_unix_time_from_system()
 			chatter.last_seen = Time.get_unix_time_from_system()
 			chatter.save()
 		first_msg = true