diff --git a/network/mhfpacket/msg_build_test.go b/network/mhfpacket/msg_build_test.go
index d6c81c04f..18e938e53 100644
--- a/network/mhfpacket/msg_build_test.go
+++ b/network/mhfpacket/msg_build_test.go
@@ -652,10 +652,10 @@ func TestBuildParseEnumerateEvent(t *testing.T) {
 // TestBuildParseAddUdTacticsPoint verifies Build/Parse round-trip for MsgMhfAddUdTacticsPoint.
 func TestBuildParseAddUdTacticsPoint(t *testing.T) {
 	tests := []struct {
-		name      string
-		ackHandle uint32
-		unk0      uint16
-		unk1      uint32
+		name          string
+		ackHandle     uint32
+		questID       uint16
+		tacticsPoints uint32
 	}{
 		{"typical", 1, 100, 50000},
 		{"zero", 0, 0, 0},
@@ -666,9 +666,9 @@ func TestBuildParseAddUdTacticsPoint(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			original := &MsgMhfAddUdTacticsPoint{
-				AckHandle: tt.ackHandle,
-				Unk0:      tt.unk0,
-				Unk1:      tt.unk1,
+				AckHandle:     tt.ackHandle,
+				QuestID:       tt.questID,
+				TacticsPoints: tt.tacticsPoints,
 			}
 
 			bf := byteframe.NewByteFrame()
@@ -685,11 +685,11 @@ func TestBuildParseAddUdTacticsPoint(t *testing.T) {
 			if parsed.AckHandle != original.AckHandle {
 				t.Errorf("AckHandle = 0x%X, want 0x%X", parsed.AckHandle, original.AckHandle)
 			}
-			if parsed.Unk0 != original.Unk0 {
-				t.Errorf("Unk0 = %d, want %d", parsed.Unk0, original.Unk0)
+			if parsed.QuestID != original.QuestID {
+				t.Errorf("QuestID = %d, want %d", parsed.QuestID, original.QuestID)
 			}
-			if parsed.Unk1 != original.Unk1 {
-				t.Errorf("Unk1 = %d, want %d", parsed.Unk1, original.Unk1)
+			if parsed.TacticsPoints != original.TacticsPoints {
+				t.Errorf("TacticsPoints = %d, want %d", parsed.TacticsPoints, original.TacticsPoints)
 			}
 		})
 	}
diff --git a/server/channelserver/handlers_achievement.go b/server/channelserver/handlers_achievement.go
index 3d5852c00..4ceb98520 100644
--- a/server/channelserver/handlers_achievement.go
+++ b/server/channelserver/handlers_achievement.go
@@ -152,6 +152,9 @@ func handleMsgMhfAddAchievement(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfPaymentAchievement(s *Session, p mhfpacket.MHFPacket) {}
 
 func handleMsgMhfDisplayedAchievement(s *Session, p mhfpacket.MHFPacket) {
+	if s.server.achievementService == nil {
+		return
+	}
 	if err := s.server.achievementService.MarkDisplayed(s.charID); err != nil {
 		s.logger.Warn("Failed to mark achievements as displayed", zap.Error(err))
 	}
diff --git a/server/channelserver/repo_achievement.go b/server/channelserver/repo_achievement.go
index 2f2942843..d4bf7ae3e 100644
--- a/server/channelserver/repo_achievement.go
+++ b/server/channelserver/repo_achievement.go
@@ -25,7 +25,10 @@ func (r *AchievementRepository) EnsureExists(charID uint32) error {
 // GetAllScores returns all 33 achievement scores for a character.
 func (r *AchievementRepository) GetAllScores(charID uint32) ([33]int32, error) {
 	var scores [33]int32
-	err := r.db.QueryRow("SELECT * FROM achievements WHERE id=$1", charID).Scan(&scores[0],
+	err := r.db.QueryRow(`SELECT ach0,ach1,ach2,ach3,ach4,ach5,ach6,ach7,ach8,ach9,
+		ach10,ach11,ach12,ach13,ach14,ach15,ach16,ach17,ach18,ach19,
+		ach20,ach21,ach22,ach23,ach24,ach25,ach26,ach27,ach28,ach29,
+		ach30,ach31,ach32 FROM achievements WHERE id=$1`, charID).Scan(
 		&scores[0], &scores[1], &scores[2], &scores[3], &scores[4], &scores[5], &scores[6], &scores[7], &scores[8],
 		&scores[9], &scores[10], &scores[11], &scores[12], &scores[13], &scores[14], &scores[15], &scores[16],
 		&scores[17], &scores[18], &scores[19], &scores[20], &scores[21], &scores[22], &scores[23], &scores[24],