diff --git a/WowsKarma.Api/Services/Posts/PostService.cs b/WowsKarma.Api/Services/Posts/PostService.cs
index b35e6b4..f6ae235 100644
--- a/WowsKarma.Api/Services/Posts/PostService.cs
+++ b/WowsKarma.Api/Services/Posts/PostService.cs
@@ -177,6 +177,7 @@ public async Task EditPostAsync(Guid id, PlayerPostDTO edited, bool modEditLock
 		current.Flairs = edited.Flairs;
 		current.UpdatedAt = DateTimeOffset.UtcNow; // Forcing UpdatedAt refresh
 		current.ReadOnly = current.ReadOnly || modEditLock;
+		current.CustomerSupportTicketId = edited.SupportTicketStatus.TicketId;
 
 		KarmaService.UpdatePlayerKarma(player, current.ParsedFlairs, previousFlairs, current.NegativeKarmaAble);
 		KarmaService.UpdatePlayerRatings(player, current.ParsedFlairs, previousFlairs);
diff --git a/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs b/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs
index 489f5c8..5c337f8 100644
--- a/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs
+++ b/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs
@@ -35,7 +35,7 @@ public record PlayerPostDTO
 	/// <summary>
 	/// Defines the status of the Customer Support ticket associated with the post when applicable.
 	/// </summary>
-	public struct CustomerSupportStatus
+	public readonly struct CustomerSupportStatus
 	{
 		/// <summary>
 		/// Whether the post has an associated Customer Support ticket.
diff --git a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts
index d8f5590..ea7067a 100644
--- a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts
+++ b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts
@@ -106,6 +106,9 @@ export class PostEditorComponent {
             this.post.replayFile = this.form.controls.replayFile.value;
         }
 
+        const ticketId = this.form.controls.supportTicketStatus.controls.ticketId.value;
+        this.post.supportTicketStatus = { hasTicket: !!ticketId, ticketId };
+
 
         if (create) {
             // Create the body as a form data