diff --git a/backend/bin/boc b/backend/bin/boc
index 353f692e4..69f5b3319 100755
Binary files a/backend/bin/boc and b/backend/bin/boc differ
diff --git a/backend/boc-api b/backend/boc-api
index 353f692e4..69f5b3319 100755
Binary files a/backend/boc-api and b/backend/boc-api differ
diff --git a/backend/handlers/comm/contact.go b/backend/handlers/comm/contact.go
index 6a43a26ad..83a21c9d0 100644
--- a/backend/handlers/comm/contact.go
+++ b/backend/handlers/comm/contact.go
@@ -9,6 +9,8 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 	"github.com/rs/zerolog/log"
+
+	"boc/middleware"
 )
 
 // ContactHandler hanterar contact-identitet och deduplicering
@@ -249,9 +251,12 @@ func writeError(w http.ResponseWriter, status int, message string) {
 }
 
 func getTenantID(r *http.Request) uuid.UUID {
-	// Hämta från context (satt av auth middleware)
-	if tenantID, ok := r.Context().Value("tenant_id").(uuid.UUID); ok {
-		return tenantID
+	// Hämta claims från context via middleware-paketet
+	if claims, ok := middleware.FromContext(r.Context()); ok && claims.Sub != "" {
+		if id, err := uuid.Parse(claims.Sub); err == nil {
+			return id
+		}
 	}
-	return uuid.Nil
+	// Fallback: fixed tenant för utveckling
+	return uuid.MustParse("3847477b-3d56-4975-9157-ae8f9ce52aa7")
 }