diff --git a/backend/src/auth.ts b/backend/src/auth.ts
index 0ef2664..2957d1d 100644
--- a/backend/src/auth.ts
+++ b/backend/src/auth.ts
@@ -21,8 +21,10 @@ export type AuthUser = {
   has_teamspace_credentials: boolean;
   zammad_email_session_webhook_enabled: boolean;
   session_billing_prompt_enabled: boolean;
+  session_work_segments_enabled: boolean;
   teamspace_time_tracking_enabled: boolean;
   zammad_session_note_default_enabled: boolean;
+  zammad_session_note_date_header_enabled: boolean;
   zammad_time_unit_rounding_enabled: boolean;
   zammad_time_unit_rounding_minutes: number;
   zammad_atoss_email_sync_enabled: boolean;
@@ -97,8 +99,10 @@ function publicUser(user: AuthUser) {
     has_teamspace_credentials: Boolean(user.has_teamspace_credentials),
     zammad_email_session_webhook_enabled: Boolean(user.zammad_email_session_webhook_enabled),
     session_billing_prompt_enabled: Boolean(user.session_billing_prompt_enabled),
+    session_work_segments_enabled: Boolean(user.session_work_segments_enabled),
     teamspace_time_tracking_enabled: Boolean(user.teamspace_time_tracking_enabled ?? true),
     zammad_session_note_default_enabled: Boolean(user.zammad_session_note_default_enabled),
+    zammad_session_note_date_header_enabled: Boolean(user.zammad_session_note_date_header_enabled),
     zammad_time_unit_rounding_enabled: Boolean(user.zammad_time_unit_rounding_enabled),
     zammad_time_unit_rounding_minutes: Number(user.zammad_time_unit_rounding_minutes ?? 15),
     zammad_atoss_email_sync_enabled: Boolean(user.zammad_atoss_email_sync_enabled ?? true),
@@ -169,8 +173,10 @@ export async function requireAuth(req: Request, res: Response, next: NextFunctio
           (u.teamspace_device_id IS NOT NULL AND u.teamspace_device_password IS NOT NULL) AS has_teamspace_credentials,
           u.zammad_email_session_webhook_enabled,
           u.session_billing_prompt_enabled,
+          u.session_work_segments_enabled,
           u.teamspace_time_tracking_enabled,
           u.zammad_session_note_default_enabled,
+          u.zammad_session_note_date_header_enabled,
           u.zammad_time_unit_rounding_enabled,
           u.zammad_time_unit_rounding_minutes,
           u.zammad_atoss_email_sync_enabled,
diff --git a/backend/src/databaseExport.ts b/backend/src/databaseExport.ts
index ac7c4e5..3fff6aa 100644
--- a/backend/src/databaseExport.ts
+++ b/backend/src/databaseExport.ts
@@ -12,12 +12,14 @@ export const databaseExportTables = [
   "auth_sessions",
   "app_settings",
   "user_preferences",
+  "organization_attribute_options",
+  "teamspace_project_exclusions",
+  "teamspace_assignment_rules",
   "organizations",
   "tickets",
   "projects",
   "teamspace_project_resources",
   "project_teamspace_entries",
-  "teamspace_project_exclusions",
   "teamspace_monthly_user_actuals",
   "project_teamspace_monthly_actuals",
   "project_teamspace_subentries",
@@ -45,6 +47,17 @@ type ColumnInfo = {
 };
 
 const jsonDataTypes = new Set(["json", "jsonb"]);
+const arrayElementTypes = new Map<string, string>([
+  ["_bool", "boolean"],
+  ["_date", "date"],
+  ["_int2", "smallint"],
+  ["_int4", "integer"],
+  ["_int8", "bigint"],
+  ["_numeric", "numeric"],
+  ["_text", "text"],
+  ["_timestamptz", "timestamptz"],
+  ["_uuid", "uuid"]
+]);
 const insertBatchSize = 500;
 
 export function quoteIdentifier(value: string) {
@@ -81,6 +94,20 @@ export function sqlLiteral(value: unknown, column?: Pick<ColumnInfo, "dataType"
     return quoteSqlString(jsonValueForSql(value));
   }
 
+  if (column?.dataType === "ARRAY") {
+    if (!Array.isArray(value)) {
+      throw new Error(`Expected PostgreSQL array value for ${column.udtName}`);
+    }
+
+    const elementType = arrayElementTypes.get(column.udtName);
+
+    if (!elementType) {
+      throw new Error(`Unsupported PostgreSQL array type: ${column.udtName}`);
+    }
+
+    return `ARRAY[${value.map((entry) => sqlLiteral(entry)).join(", ")}]::${elementType}[]`;
+  }
+
   if (value instanceof Date) {
     return quoteSqlString(value.toISOString());
   }
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 1387ab0..4ae1030 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -9,6 +9,11 @@ import { migrate } from "./migrations.js";
 import { pool, query, withTransaction } from "./db.js";
 import { clearAuthSession, createAuthSession, currentUser, hashPassword, requireAdmin, requireAuth, requireUser, verifyPassword } from "./auth.js";
 import { decryptSecret, encryptSecret } from "./secrets.js";
+import {
+  organizationAttributeNames,
+  parseZammadOrganizationAttributeOptions,
+  type OrganizationAttributeName
+} from "./zammadOrganizationAttributes.js";
 import {
   databaseExportTables as backupTables,
   exportDatabaseSql,
@@ -41,6 +46,7 @@ const requestBodyLimit = process.env.REQUEST_BODY_LIMIT ?? "250mb";
 const zammadEmailWebhookToken = process.env.ZAMMAD_EMAIL_WEBHOOK_TOKEN ?? process.env.ZAMMAD_WEBHOOK_TOKEN ?? "";
 const zammadRequestTimeoutMs = positiveIntegerFromEnv("ZAMMAD_REQUEST_TIMEOUT_MS", 30_000);
 const atossSupportEmail = "support.atc@atoss.com";
+const teamspaceAssignmentTargetTicketNumber = "Fix#0";
 
 app.set("etag", false);
 app.use(cors());
@@ -230,6 +236,14 @@ function optionalString(value: unknown) {
   return trimmed.length > 0 ? trimmed : null;
 }
 
+function parseOptionalPositiveInteger(value: unknown, field: string) {
+  if (value === undefined || value === null || value === "") {
+    return null;
+  }
+
+  return parsePositiveInteger(value, field);
+}
+
 function optionalSessionActivity(value: unknown) {
   if (value === undefined || value === null) {
     return "";
@@ -568,7 +582,15 @@ type OrganizationRow = {
   id: string;
   zammad_id: string;
   name: string;
+  customer_owner_option_id?: string | null;
+  customer_owner?: string | null;
+  customer_owner_display_name?: string | null;
+  hotline_contract_option_id?: string | null;
+  hotline_contract?: string | null;
+  hotline_contract_display_name?: string | null;
   synced_at: string;
+  created_at?: string;
+  updated_at?: string;
 };
 
 type ProjectRow = {
@@ -660,6 +682,38 @@ const zammadBaseUrlSettingKey = "zammad.base_url";
 const zammadApiKeySettingKey = "zammad.api_key";
 const teamspaceBaseUrlSettingKey = "teamspace.base_url";
 const teamspaceAdminCredentialsUserIdSettingKey = "teamspace.admin_credentials_user_id";
+const adminUserSelectSql = `
+  id,
+  username,
+  display_name,
+  role,
+  active,
+  zammad_user_id::text AS zammad_user_id,
+  (zammad_api_token IS NOT NULL) AS has_zammad_api_token,
+  teamspace_user_id::text AS teamspace_user_id,
+  (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials,
+  zammad_email_session_webhook_enabled,
+  session_billing_prompt_enabled,
+  session_work_segments_enabled,
+  teamspace_time_tracking_enabled,
+  zammad_session_note_default_enabled,
+  zammad_session_note_date_header_enabled,
+  zammad_time_unit_rounding_enabled,
+  zammad_time_unit_rounding_minutes,
+  zammad_atoss_email_sync_enabled,
+  COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id,
+  project_followup_enabled,
+  project_followup_weeks,
+  project_followup_second_enabled,
+  project_followup_second_weeks,
+  project_followup_complete_on_session,
+  teamspace_initial_actuals_synced_at::text AS teamspace_initial_actuals_synced_at,
+  teamspace_initial_actuals_synced_by::text AS teamspace_initial_actuals_synced_by,
+  teamspace_initial_actuals_unlocked_at::text AS teamspace_initial_actuals_unlocked_at,
+  teamspace_initial_actuals_unlocked_by::text AS teamspace_initial_actuals_unlocked_by,
+  created_at,
+  updated_at
+`;
 
 type QueryClient = {
   query: <T extends pg.QueryResultRow = pg.QueryResultRow>(text: string, params?: unknown[]) => Promise<{ rows: T[]; rowCount: number | null }>;
@@ -1161,6 +1215,35 @@ function zammadSessionArticleBodyForDelivery(body: string, contentType: "text/pl
   return /<\s*[a-z][a-z0-9-]*(?:\s|\/?>)/i.test(body) ? body : `<div>${body}</div>`;
 }
 
+function berlinDateLabelForDate(date: Date) {
+  const parts = new Intl.DateTimeFormat("en-CA", {
+    timeZone: "Europe/Berlin",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  }).formatToParts(date);
+  const year = parts.find((part) => part.type === "year")?.value;
+  const month = parts.find((part) => part.type === "month")?.value;
+  const day = parts.find((part) => part.type === "day")?.value;
+
+  return `${year}-${month}-${day}`;
+}
+
+function germanDateFromDateLabel(dateLabel: string) {
+  const [year, month, day] = dateLabel.split("-");
+  return `${day}.${month}.${year}`;
+}
+
+function zammadSessionArticleBodyWithDateHeader(body: string, contentType: "text/plain" | "text/html", dateLabel: string) {
+  const header = germanDateFromDateLabel(dateLabel);
+
+  if (contentType === "text/html") {
+    return `<div>${header}</div><div><br></div>${body}`;
+  }
+
+  return `${header}\n\n${body}`;
+}
+
 async function postZammadSessionArticleForUser(userId: string, payload: ZammadSessionArticlePayload) {
   const credentials = await getZammadCredentialsForUser(userId);
   return postZammadJson(credentials.baseUrl, credentials.apiToken, "/api/v1/ticket_articles", payload);
@@ -1998,7 +2081,9 @@ type SessionCreationInput = {
   requestedProjectTeamspaceEntryId: number | null;
   billingStatus: "billable" | "billed" | "non_billable" | null;
   createZammadArticle: boolean;
+  zammadArticleDateHeader: boolean;
   zammadArticleTypeId: number;
+  workSegments: WorkSegment[];
   startedAt: Date;
   endedAt: Date;
   durationSeconds: number;
@@ -2021,7 +2106,9 @@ async function createSessionForUser(input: SessionCreationInput) {
     requestedProjectTeamspaceEntryId,
     billingStatus,
     createZammadArticle,
+    zammadArticleDateHeader,
     zammadArticleTypeId,
+    workSegments,
     startedAt,
     endedAt,
     durationSeconds,
@@ -2170,7 +2257,7 @@ async function createSessionForUser(input: SessionCreationInput) {
     const ownerUserId = zammadTicket
       ? ownerMapping?.status === "ambiguous" ? userId : ownerMapping?.userId ?? null
       : existingTicket?.user_id ?? userId;
-    const ticketResult = await client.query<{ id: string; ticket_number: string; organization_id: string | null; customer_name: string | null; work_type: string | null; zammad_ticket_id: string | null }>(
+    const ticketResult = await client.query<{ id: string; ticket_number: string; organization_id: string | null; customer_name: string | null; work_type: string | null; atoss_support: boolean; zammad_ticket_id: string | null }>(
       `
         INSERT INTO tickets (user_id, ticket_number, organization_id, customer_name, work_type)
         VALUES ($1, $2, $3, $4, $5)
@@ -2187,7 +2274,7 @@ async function createSessionForUser(input: SessionCreationInput) {
             ) THEN 'consulting'
             ELSE COALESCE(tickets.work_type, EXCLUDED.work_type)
           END
-        RETURNING id, ticket_number, organization_id, customer_name, work_type, zammad_ticket_id::text AS zammad_ticket_id;
+        RETURNING id, ticket_number, organization_id, customer_name, work_type, atoss_support, zammad_ticket_id::text AS zammad_ticket_id;
       `,
       [ownerUserId, effectiveTicketNumber, organization.id, organization.name, existingTicket?.project_id ? "consulting" : requestedWorkType, userId]
     );
@@ -2208,15 +2295,34 @@ async function createSessionForUser(input: SessionCreationInput) {
         closeReviewRequired: zammadTicket?.zammadStateId === 4,
         zammadOwnerId: zammadTicket?.zammadOwnerId ?? null
       });
-      const teamspaceAssignment = await resolveProjectTeamspaceAssignmentForSession(
-        client,
-        ticket.id,
-        userId,
-        workType,
-        requestedProjectTeamspaceEntryId,
-        zammadTicket?.zammadOwnerId ?? null
-      );
-      projectTeamspaceEntryId = teamspaceAssignment.projectTeamspaceEntryId;
+      await autoAssignSingleProjectTeamspaceEntry(client, ticket.id);
+      if (zammadTicket) {
+        await refreshSyncedTeamspaceAssignment(client, ticket.id, zammadTeamspaceProjectList(zammadTicket));
+      }
+      projectTeamspaceEntryId = requestedProjectTeamspaceEntryId === null
+        ? await resolveSyncedTeamspaceEntry(client, ticket.id, userId)
+        : null;
+
+      if (projectTeamspaceEntryId === null) {
+        const teamspaceAssignment = await resolveProjectTeamspaceAssignmentForSession(
+          client,
+          ticket.id,
+          userId,
+          workType,
+          requestedProjectTeamspaceEntryId,
+          zammadTicket?.zammadOwnerId ?? null
+        );
+        projectTeamspaceEntryId = teamspaceAssignment.projectTeamspaceEntryId;
+      }
+    } else if (workType === "support") {
+      if (zammadTicket) {
+        await refreshSyncedTeamspaceAssignment(client, ticket.id, zammadTeamspaceProjectList(zammadTicket));
+      }
+      projectTeamspaceEntryId = await resolveSyncedTeamspaceEntry(client, ticket.id, userId);
+
+      if (projectTeamspaceEntryId === null && ticket.atoss_support) {
+        projectTeamspaceEntryId = await resolveAtossSupportTeamspaceEntry(client, userId, startedAt);
+      }
     }
 
     const sessionResult = await client.query(
@@ -2233,11 +2339,12 @@ async function createSessionForUser(input: SessionCreationInput) {
           ended_at,
           duration_seconds,
           rounded_minutes,
+          work_segments,
           project_teamspace_entry_id,
           billing_status,
           billing_updated_at
         )
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, CASE WHEN $13::text IS NULL THEN NULL ELSE now() END)
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12::jsonb, $13, $14, CASE WHEN $14::text IS NULL THEN NULL ELSE now() END)
         RETURNING *;
       `,
       [
@@ -2252,14 +2359,21 @@ async function createSessionForUser(input: SessionCreationInput) {
         endedAt.toISOString(),
         durationSeconds,
         roundedMinutes,
+        JSON.stringify(workSegments),
         projectTeamspaceEntryId,
         billingStatus
       ]
     );
     const session = sessionResult.rows[0];
 
-    const zammadArticleBody = zammadArticleHtml ?? "";
     const zammadArticleContentType = "text/html" as const;
+    const zammadArticleDateLabel = berlinDateLabelForDate(startedAt);
+    const shouldAddZammadArticleDateHeader =
+      zammadArticleDateHeader
+      && zammadArticleDateLabel < currentBerlinDateLabel();
+    const zammadArticleBody = shouldAddZammadArticleDateHeader
+      ? zammadSessionArticleBodyWithDateHeader(zammadArticleHtml ?? "", zammadArticleContentType, zammadArticleDateLabel)
+      : zammadArticleHtml ?? "";
     const shouldCreateZammadArticle = createZammadArticle && Boolean(zammadArticleHtml);
     const zammadArticle: {
       requested: boolean;
@@ -2760,7 +2874,9 @@ async function createZammadEmailSessionFromWebhook(payload: unknown, deliveryId:
     requestedProjectTeamspaceEntryId: null,
     billingStatus: null,
     createZammadArticle: false,
+    zammadArticleDateHeader: false,
     zammadArticleTypeId: 6,
+    workSegments: [],
     startedAt,
     endedAt,
     durationSeconds,
@@ -3127,6 +3243,9 @@ async function importZammadTicketForUser(client: QueryClient, zammadTicket: Zamm
     });
   }
 
+  await autoAssignSingleProjectTeamspaceEntry(client, result.rows[0].id);
+  await refreshSyncedTeamspaceAssignment(client, result.rows[0].id, zammadTeamspaceProjectList(zammadTicket));
+
   return result.rows[0].id;
 }
 
@@ -3173,6 +3292,7 @@ type ActiveTimerRow = {
   started_at: string;
   paused_total_ms: string | number;
   paused_at: string | null;
+  work_segments: unknown;
   phase: ActiveTimerPhase;
 };
 
@@ -3191,10 +3311,86 @@ const activeTimerSelect = `
     started_at,
     paused_total_ms,
     paused_at,
+    work_segments,
     phase
   FROM active_timers
 `;
 
+type WorkSegment = {
+  startedAt: string;
+  endedAt: string | null;
+};
+
+function normalizeWorkSegments(value: unknown): WorkSegment[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  return value.flatMap((item) => {
+    if (!isPlainObject(item)) {
+      return [];
+    }
+
+    const startedAtRaw = typeof item.startedAt === "string" ? item.startedAt : typeof item.started_at === "string" ? item.started_at : null;
+    const endedAtRaw = typeof item.endedAt === "string" ? item.endedAt : typeof item.ended_at === "string" ? item.ended_at : null;
+
+    if (!startedAtRaw) {
+      return [];
+    }
+
+    const startedAt = new Date(startedAtRaw);
+    const endedAt = endedAtRaw ? new Date(endedAtRaw) : null;
+
+    if (Number.isNaN(startedAt.getTime()) || (endedAt && Number.isNaN(endedAt.getTime()))) {
+      return [];
+    }
+
+    if (endedAt && endedAt.getTime() < startedAt.getTime()) {
+      return [];
+    }
+
+    return [{
+      startedAt: startedAt.toISOString(),
+      endedAt: endedAt?.toISOString() ?? null
+    }];
+  }).slice(0, 200);
+}
+
+function closeOpenWorkSegment(segments: WorkSegment[], endedAt: Date) {
+  const closed = segments.map((segment, index) =>
+    index === segments.length - 1 && segment.endedAt === null
+      ? { ...segment, endedAt: endedAt.toISOString() }
+      : segment
+  );
+
+  return closed.filter((segment) => !segment.endedAt || new Date(segment.endedAt).getTime() > new Date(segment.startedAt).getTime());
+}
+
+function appendOpenWorkSegment(segments: WorkSegment[], startedAt: Date) {
+  const closed = closeOpenWorkSegment(segments, startedAt);
+  return [...closed, { startedAt: startedAt.toISOString(), endedAt: null }].slice(-200);
+}
+
+function workSegmentsForNewTimer(enabled: boolean, startedAt: Date, pausedAt: Date | null) {
+  if (!enabled) {
+    return [];
+  }
+
+  return [{
+    startedAt: startedAt.toISOString(),
+    endedAt: pausedAt?.toISOString() ?? null
+  }];
+}
+
+function workSegmentsForSession(value: unknown, startedAt: Date, endedAt: Date) {
+  return normalizeWorkSegments(value)
+    .map((segment) => ({
+      startedAt: new Date(Math.max(startedAt.getTime(), new Date(segment.startedAt).getTime())).toISOString(),
+      endedAt: new Date(Math.min(endedAt.getTime(), new Date(segment.endedAt ?? endedAt.toISOString()).getTime())).toISOString()
+    }))
+    .filter((segment) => new Date(segment.endedAt).getTime() > new Date(segment.startedAt).getTime());
+}
+
 function serializeActiveTimer(row: ActiveTimerRow) {
   return {
     id: row.id,
@@ -3210,6 +3406,7 @@ function serializeActiveTimer(row: ActiveTimerRow) {
     startedAt: new Date(row.started_at).getTime(),
     pausedTotalMs: Number(row.paused_total_ms),
     pausedAt: row.paused_at ? new Date(row.paused_at).getTime() : null,
+    workSegments: normalizeWorkSegments(row.work_segments),
     phase: row.phase
   };
 }
@@ -3229,6 +3426,63 @@ async function activeTimersForUser(client: Pick<pg.PoolClient, "query">, userId:
   return result.rows.map(serializeActiveTimer);
 }
 
+async function pauseOtherRunningTimers(
+  client: QueryClient,
+  userId: string,
+  now: Date,
+  options: { exceptId?: number; exceptTicketNumber?: string },
+  trackWorkSegments: boolean
+) {
+  const filters = ["user_id = $1", "phase = 'running'"];
+  const params: unknown[] = [userId];
+
+  if (options.exceptId !== undefined) {
+    params.push(options.exceptId);
+    filters.push(`id <> $${params.length}`);
+  }
+
+  if (options.exceptTicketNumber !== undefined) {
+    params.push(options.exceptTicketNumber);
+    filters.push(`ticket_number <> $${params.length}`);
+  }
+
+  const runningResult = await client.query<ActiveTimerRow>(
+    `
+      ${activeTimerSelect}
+      WHERE ${filters.join(" AND ")}
+      FOR UPDATE;
+    `,
+    params
+  );
+
+  for (const timer of runningResult.rows) {
+    const currentWorkSegments = normalizeWorkSegments(timer.work_segments);
+    const nextWorkSegments = trackWorkSegments
+      ? closeOpenWorkSegment(
+        currentWorkSegments.length > 0 ? currentWorkSegments : [{ startedAt: new Date(timer.started_at).toISOString(), endedAt: null }],
+        now
+      )
+      : [];
+    await client.query(
+      `
+        UPDATE active_timers
+        SET phase = 'paused',
+            paused_at = COALESCE(paused_at, $3),
+            work_segments = $4::jsonb,
+            updated_at = now()
+        WHERE id = $1
+          AND user_id = $2;
+      `,
+      [
+        timer.id,
+        userId,
+        now.toISOString(),
+        JSON.stringify(nextWorkSegments)
+      ]
+    );
+  }
+}
+
 function parseTimerPhase(value: unknown, fallback: ActiveTimerPhase = "running") {
   if (value === undefined || value === null || value === "") {
     return fallback;
@@ -3593,6 +3847,9 @@ type RecurringBillingRow = {
   organization_name: string;
   activity: string;
   work_type: "support" | "consulting";
+  teamspace_project: string | null;
+  hour_budget_minutes: number | null;
+  manual_consumption_minutes: number;
   recurrence_type: "weekly" | "every_n_weeks";
   interval_value: number;
   valid_from: string;
@@ -3640,6 +3897,9 @@ async function ensureRecurringSessionsForUserPeriod(userId: string, startIso: st
         o.name AS organization_name,
         rb.activity,
         rb.work_type,
+        rb.teamspace_project,
+        rb.hour_budget_minutes,
+        rb.manual_consumption_minutes,
         rb.recurrence_type,
         rb.interval_value,
         rb.valid_from::text,
@@ -3729,21 +3989,29 @@ async function ensureRecurringSessionsForUserPeriod(userId: string, startIso: st
               ON CONFLICT (ticket_number)
               DO UPDATE SET
                 user_id = COALESCE(tickets.user_id, EXCLUDED.user_id),
-                organization_id = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN COALESCE(tickets.organization_id, EXCLUDED.organization_id) ELSE tickets.organization_id END,
-                customer_name = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN COALESCE(tickets.customer_name, EXCLUDED.customer_name) ELSE tickets.customer_name END,
+                organization_id = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN EXCLUDED.organization_id ELSE tickets.organization_id END,
+                customer_name = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN EXCLUDED.customer_name ELSE tickets.customer_name END,
                 work_type = CASE
                   WHEN tickets.user_id IS NOT NULL AND tickets.user_id <> EXCLUDED.user_id THEN tickets.work_type
-                  WHEN EXCLUDED.work_type = 'consulting' THEN 'consulting'
-                  ELSE COALESCE(tickets.work_type, EXCLUDED.work_type)
+                  ELSE EXCLUDED.work_type
                 END
               RETURNING id;
             `,
             [rule.ticket_number, rule.organization_id, rule.organization_name, rule.work_type, userId]
           );
 
-          if (rule.work_type === "consulting") {
-            await ensureProjectForTicket(client, ticketResult.rows[0].id, userId);
-          }
+          let projectTeamspaceEntryId: number | null = await ensureRecurringBillingProjectConfiguration(
+            client,
+            ticketResult.rows[0].id,
+            userId,
+            {
+              workType: rule.work_type,
+              teamspaceProject: rule.teamspace_project,
+              hourBudgetMinutes: rule.hour_budget_minutes,
+              manualConsumptionMinutes: rule.manual_consumption_minutes
+            }
+          );
+          projectTeamspaceEntryId ??= await resolveSyncedTeamspaceEntry(client, ticketResult.rows[0].id, userId);
 
           await client.query(
             `
@@ -3761,9 +4029,10 @@ async function ensureRecurringSessionsForUserPeriod(userId: string, startIso: st
                 recurring_billing_id,
                 recurring_billing_slot_id,
                 recurring_occurrence_date,
-                recurring_occurrence_key
+                recurring_occurrence_key,
+                project_teamspace_entry_id
               )
-              VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13::date, $14)
+              VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13::date, $14, $15)
               ON CONFLICT (recurring_occurrence_key) WHERE recurring_occurrence_key IS NOT NULL DO NOTHING;
             `,
             [
@@ -3780,7 +4049,8 @@ async function ensureRecurringSessionsForUserPeriod(userId: string, startIso: st
               rule.id,
               slot.id,
               occurrenceDate,
-              occurrenceKey
+              occurrenceKey,
+              projectTeamspaceEntryId
             ]
           );
           existingKeys.add(occurrenceKey);
@@ -3942,6 +4212,110 @@ async function ensureProjectForTicket(
   }
 }
 
+async function ensureRecurringBillingProjectConfiguration(
+  client: QueryClient,
+  ticketId: string,
+  userId: string,
+  configuration: {
+    workType: string;
+    teamspaceProject: string | null;
+    hourBudgetMinutes: number | null;
+    manualConsumptionMinutes: number;
+    removeProjectWhenUnconfigured?: boolean;
+  }
+) {
+  const hasProjectConfiguration = Boolean(
+    configuration.teamspaceProject
+    || configuration.hourBudgetMinutes !== null
+    || configuration.manualConsumptionMinutes > 0
+  );
+
+  if (configuration.workType !== "consulting" && !hasProjectConfiguration) {
+    if (configuration.removeProjectWhenUnconfigured) {
+      await deleteProjectDataForTicket(client, ticketId, userId);
+    }
+    return null;
+  }
+
+  await ensureProjectForTicket(client, ticketId, userId, {
+    teamspaceProject: configuration.teamspaceProject,
+    hourBudgetMinutes: configuration.hourBudgetMinutes
+  });
+
+  const projectResult = await client.query<{ id: string }>(
+    `
+      UPDATE projects
+      SET teamspace_project = $3,
+          hour_budget_minutes = $4,
+          manual_consumption_minutes = $5,
+          updated_at = now()
+      WHERE ticket_id = $1
+        AND user_id = $2
+      RETURNING id::text;
+    `,
+    [
+      ticketId,
+      userId,
+      configuration.teamspaceProject,
+      configuration.hourBudgetMinutes,
+      configuration.manualConsumptionMinutes
+    ]
+  );
+  const projectId = projectResult.rows[0]?.id;
+
+  if (!projectId) {
+    return null;
+  }
+
+  const entryResult = await client.query<{ id: string }>(
+    `
+      UPDATE project_teamspace_entries
+      SET teamspace_project = $2,
+          hour_budget_minutes = $3,
+          budget_sync_disabled = $3::int IS NOT NULL,
+          manual_consumption_minutes = $4,
+          teamspace_api_project_id = CASE
+            WHEN teamspace_project IS NOT DISTINCT FROM $2::text THEN teamspace_api_project_id
+            ELSE NULL
+          END,
+          teamspace_api_project_url = CASE
+            WHEN teamspace_project IS NOT DISTINCT FROM $2::text THEN teamspace_api_project_url
+            ELSE NULL
+          END,
+          teamspace_project_resource_id = CASE
+            WHEN teamspace_project IS NOT DISTINCT FROM $2::text THEN teamspace_project_resource_id
+            ELSE NULL
+          END,
+          updated_at = now()
+      WHERE project_id = $1
+        AND is_default
+      RETURNING id::text;
+    `,
+    [projectId, configuration.teamspaceProject, configuration.hourBudgetMinutes, configuration.manualConsumptionMinutes]
+  );
+  const entryId = entryResult.rows[0]?.id ?? null;
+
+  if (configuration.teamspaceProject) {
+    await consolidateSharedTeamspaceProjectData(client, [configuration.teamspaceProject]);
+  }
+
+  if (entryId) {
+    await client.query(
+      `
+        UPDATE project_teamspace_entries
+        SET hour_budget_minutes = $2,
+            budget_sync_disabled = $2::int IS NOT NULL,
+            manual_consumption_minutes = $3,
+            updated_at = now()
+        WHERE id = $1;
+      `,
+      [entryId, configuration.hourBudgetMinutes, configuration.manualConsumptionMinutes]
+    );
+  }
+
+  return entryId ? Number(entryId) : null;
+}
+
 async function getProjectRowForTicket(client: QueryClient, ticketId: string, projectOwnerUserId: string | null, viewerUserId: string, zammadOwnerId: number | null = null) {
   const result = await client.query<ProjectRow>(
     `
@@ -3959,6 +4333,11 @@ async function getProjectRowForTicket(client: QueryClient, ticketId: string, pro
               AND viewer.active
               AND viewer.zammad_user_id = t.zammad_owner_id
           )
+        ) AND NOT EXISTS (
+          SELECT 1
+          FROM recurring_billings rb_edit
+          WHERE rb_edit.user_id = $3
+            AND COALESCE(rb_edit.ticket_number, 'Fix#' || rb_edit.id) = t.ticket_number
         ), false) AS can_edit,
         p.ticket_id::text AS ticket_id,
         t.ticket_number,
@@ -4230,6 +4609,8 @@ async function resolveProjectTeamspaceAssignmentForSession(
       SELECT id::text AS id, is_default
       FROM project_teamspace_entries
       WHERE project_id = $1
+        AND teamspace_project IS NOT NULL
+        AND btrim(teamspace_project) <> ''
       ORDER BY is_default DESC, display_order ASC, id ASC;
     `,
     [projectId]
@@ -4243,14 +4624,8 @@ async function resolveProjectTeamspaceAssignmentForSession(
     return { projectTeamspaceEntryId: Number(entriesResult.rows[0].id) };
   }
 
-  const defaultEntries = entriesResult.rows.filter((entry) => entry.is_default);
-
-  if (!requestedEntryId && defaultEntries.length === 1) {
-    return { projectTeamspaceEntryId: Number(defaultEntries[0].id) };
-  }
-
   if (!requestedEntryId) {
-    throw badRequest("projectTeamspaceEntryId is required when a project has multiple Teamspace entries");
+    return { projectTeamspaceEntryId: null };
   }
 
   if (!entriesResult.rows.some((entry) => entry.id === String(requestedEntryId))) {
@@ -4260,11 +4635,395 @@ async function resolveProjectTeamspaceAssignmentForSession(
   return { projectTeamspaceEntryId: requestedEntryId };
 }
 
+async function resolveAtossSupportTeamspaceEntry(client: QueryClient, userId: string, startedAt: Date) {
+  const supportDate = berlinDateLabelForDate(startedAt);
+  const defaultResult = await client.query<{ teamspace_project: string }>(
+    `
+      SELECT teamspace_project
+      FROM teamspace_project_exclusions
+      WHERE atoss_support_default = true
+        AND (atoss_support_valid_from IS NULL OR atoss_support_valid_from <= $1::date)
+        AND (atoss_support_valid_to IS NULL OR atoss_support_valid_to >= $1::date)
+      ORDER BY
+        atoss_support_valid_from DESC NULLS LAST,
+        atoss_support_valid_to ASC NULLS LAST,
+        teamspace_project ASC
+      LIMIT 1;
+    `,
+    [supportDate]
+  );
+  const configuredProject = defaultResult.rows[0]?.teamspace_project ?? null;
+
+  if (!configuredProject) {
+    return null;
+  }
+
+  return ensureTeamspaceEntryForAssignmentTarget(client, configuredProject, userId);
+}
+
+async function clearAtossSupportSessionAssignments(client: QueryClient, ticketId: string) {
+  await client.query(
+    `
+      UPDATE sessions session
+      SET project_teamspace_entry_id = NULL
+      WHERE session.ticket_id = $1
+        AND EXISTS (
+          SELECT 1
+          FROM project_teamspace_entries entry
+          JOIN projects target_project ON target_project.id = entry.project_id
+          JOIN tickets target_ticket ON target_ticket.id = target_project.ticket_id
+          WHERE entry.id = session.project_teamspace_entry_id
+            AND target_ticket.ticket_number = $2
+        );
+    `,
+    [ticketId, teamspaceAssignmentTargetTicketNumber]
+  );
+}
+
+async function assignAtossSupportSessions(client: QueryClient, ticketId: string) {
+  const sessionsResult = await client.query<{ id: string; user_id: string; started_at: string }>(
+    `
+      SELECT id::text AS id, user_id::text AS user_id, started_at::text AS started_at
+      FROM sessions
+      WHERE ticket_id = $1
+      ORDER BY started_at ASC, id ASC;
+    `,
+    [ticketId]
+  );
+  let assignedSessions = 0;
+
+  await clearAtossSupportSessionAssignments(client, ticketId);
+
+  for (const session of sessionsResult.rows) {
+    const entryId = await resolveAtossSupportTeamspaceEntry(client, session.user_id, new Date(session.started_at));
+
+    if (entryId === null) {
+      continue;
+    }
+
+    const updateResult = await client.query(
+      `
+        UPDATE sessions
+        SET project_teamspace_entry_id = $2
+        WHERE id = $1
+          AND project_teamspace_entry_id IS DISTINCT FROM $2::bigint;
+      `,
+      [session.id, entryId]
+    );
+    assignedSessions += updateResult.rowCount ?? 0;
+  }
+
+  return assignedSessions;
+}
+
+async function ticketHasConcreteTeamspaceProject(client: QueryClient, ticketId: string) {
+  const result = await client.query<{ exists: boolean }>(
+    `
+      SELECT EXISTS (
+        SELECT 1
+        FROM projects project
+        JOIN project_teamspace_entries entry ON entry.project_id = project.id
+        WHERE project.ticket_id = $1
+          AND entry.teamspace_project IS NOT NULL
+          AND btrim(entry.teamspace_project) <> ''
+      ) AS exists;
+    `,
+    [ticketId]
+  );
+
+  return Boolean(result.rows[0]?.exists);
+}
+
+type TeamspaceAssignmentMatch = {
+  id: string;
+  name: string;
+  teamspace_project: string;
+};
+
+async function findMatchingTeamspaceAssignmentRule(
+  client: QueryClient,
+  organizationId: number,
+  workType: "support" | "consulting"
+) {
+  const ruleResult = await client.query<TeamspaceAssignmentMatch>(
+    `
+      SELECT rule.id::text AS id, rule.name, rule.teamspace_project
+      FROM teamspace_assignment_rules rule
+      JOIN organizations organization ON organization.zammad_id = $1
+      WHERE rule.active = true
+        AND (
+          ($2::text = 'support' AND rule.support_enabled = true)
+          OR ($2::text = 'consulting' AND rule.consulting_enabled = true)
+        )
+        AND (
+          rule.customer_owner_option_id IS NULL
+          OR rule.customer_owner_option_id = organization.customer_owner_option_id
+        )
+        AND (
+          rule.hotline_contract_option_id IS NULL
+          OR rule.hotline_contract_option_id = organization.hotline_contract_option_id
+        )
+      ORDER BY rule.priority ASC, rule.id ASC
+      LIMIT 1;
+    `,
+    [organizationId, workType]
+  );
+
+  return ruleResult.rows[0] ?? null;
+}
+
+async function findTeamspaceEntryForProject(client: QueryClient, teamspaceProject: string, userId: string | null) {
+  const entryResult = await client.query<{ id: string }>(
+    `
+      SELECT entry.id::text AS id
+      FROM project_teamspace_entries entry
+      JOIN projects project ON project.id = entry.project_id
+      WHERE lower(btrim(entry.teamspace_project)) = lower(btrim($1))
+      ORDER BY
+        ($2::bigint IS NOT NULL AND project.user_id = $2::bigint) DESC,
+        (project.closed_at IS NULL) DESC,
+        entry.is_default DESC,
+        entry.display_order ASC,
+        entry.id ASC
+      LIMIT 1;
+    `,
+    [teamspaceProject, userId]
+  );
+
+  return entryResult.rows[0] ? Number(entryResult.rows[0].id) : null;
+}
+
+async function ensureTeamspaceEntryForAssignmentTarget(client: QueryClient, teamspaceProject: string, userId: string | null) {
+  const existingEntryId = await findTeamspaceEntryForProject(client, teamspaceProject, userId);
+
+  if (existingEntryId !== null) {
+    return existingEntryId;
+  }
+
+  const exclusionResult = await client.query<{
+    teamspace_api_project_id: string | null;
+    teamspace_api_project_ids: string[] | null;
+    teamspace_name: string | null;
+  }>(
+    `
+      SELECT
+        teamspace_api_project_id::text AS teamspace_api_project_id,
+        ARRAY(SELECT value::text FROM unnest(teamspace_api_project_ids) AS value ORDER BY value) AS teamspace_api_project_ids,
+        teamspace_name
+      FROM teamspace_project_exclusions
+      WHERE lower(btrim(teamspace_project)) = lower(btrim($1))
+      LIMIT 1;
+    `,
+    [teamspaceProject]
+  );
+  const exclusion = exclusionResult.rows[0];
+
+  if (!exclusion) {
+    throw badRequest(`Ziel-TS-Projekt "${teamspaceProject}" ist nicht als globale Teamspace-Ausnahme gespeichert`);
+  }
+
+  await client.query("SELECT pg_advisory_xact_lock(hashtext($1));", [`teamspace-assignment-target:${teamspaceProject.toLocaleLowerCase("de")}`]);
+
+  const concurrentEntryId = await findTeamspaceEntryForProject(client, teamspaceProject, userId);
+  if (concurrentEntryId !== null) {
+    return concurrentEntryId;
+  }
+
+  const targetTicketResult = await client.query<{ id: string }>(
+    `
+      INSERT INTO tickets (ticket_number, title, work_type)
+      VALUES ($1, 'Technische TS-Zuordnungsziele', 'support')
+      ON CONFLICT (ticket_number)
+      DO UPDATE SET title = EXCLUDED.title
+      RETURNING id::text AS id;
+    `,
+    [teamspaceAssignmentTargetTicketNumber]
+  );
+  const targetTicketId = targetTicketResult.rows[0].id;
+  let targetProjectResult = await client.query<{ id: string }>(
+    `
+      SELECT id::text AS id
+      FROM projects
+      WHERE ticket_id = $1
+        AND user_id IS NULL
+        AND zammad_owner_id IS NULL
+      ORDER BY id ASC
+      LIMIT 1
+      FOR UPDATE;
+    `,
+    [targetTicketId]
+  );
+
+  if (!targetProjectResult.rows[0]) {
+    targetProjectResult = await client.query<{ id: string }>(
+      `
+        INSERT INTO projects (user_id, zammad_owner_id, ticket_id, teamspace_project, description, goals)
+        VALUES (NULL, NULL, $1, NULL, 'Technischer Container für automatische TS-Zuordnungen', '')
+        RETURNING id::text AS id;
+      `,
+      [targetTicketId]
+    );
+  }
+
+  const apiProjectId = exclusion.teamspace_api_project_id
+    ?? exclusion.teamspace_api_project_ids?.[0]
+    ?? null;
+  const insertResult = await client.query<{ id: string }>(
+    `
+      INSERT INTO project_teamspace_entries (
+        project_id,
+        teamspace_project,
+        teamspace_description,
+        is_default,
+        teamspace_api_project_id,
+        budget_sync_disabled,
+        manual_consumption_minutes,
+        display_order
+      )
+      VALUES (
+        $1,
+        $2,
+        $3,
+        false,
+        $4,
+        true,
+        0,
+        COALESCE((SELECT MAX(display_order) + 1024 FROM project_teamspace_entries WHERE project_id = $1), 0)
+      )
+      RETURNING id::text AS id;
+    `,
+    [targetProjectResult.rows[0].id, teamspaceProject, exclusion.teamspace_name ?? "", apiProjectId]
+  );
+
+  return Number(insertResult.rows[0].id);
+}
+
+async function resolveSyncedTeamspaceEntry(client: QueryClient, ticketId: string, userId: string) {
+  const assignmentResult = await client.query<{ rule_name: string; teamspace_project: string }>(
+    `
+      SELECT rule.name AS rule_name, ticket.teamspace_assignment_project AS teamspace_project
+      FROM tickets ticket
+      JOIN teamspace_assignment_rules rule ON rule.id = ticket.teamspace_assignment_rule_id
+      WHERE ticket.id = $1
+        AND ticket.teamspace_assignment_project IS NOT NULL
+        AND btrim(ticket.teamspace_assignment_project) <> '';
+    `,
+    [ticketId]
+  );
+  const assignment = assignmentResult.rows[0];
+
+  if (!assignment) {
+    return null;
+  }
+
+  return ensureTeamspaceEntryForAssignmentTarget(client, assignment.teamspace_project, userId);
+}
+
+async function refreshSyncedTeamspaceAssignment(
+  client: QueryClient,
+  ticketId: string,
+  incomingTeamspaceProjects: string[] = []
+) {
+  const ticketResult = await client.query<{ organization_id: string | null; work_type: "support" | "consulting" | null; user_id: string | null; atoss_support: boolean }>(
+    `
+      SELECT organization_id::text AS organization_id, work_type, user_id::text AS user_id, atoss_support
+      FROM tickets
+      WHERE id = $1
+      FOR UPDATE;
+    `,
+    [ticketId]
+  );
+  const ticket = ticketResult.rows[0];
+
+  if (!ticket) {
+    return null;
+  }
+
+  if (ticket.work_type !== "support" && ticket.atoss_support) {
+    await client.query("UPDATE tickets SET atoss_support = false WHERE id = $1;", [ticketId]);
+    ticket.atoss_support = false;
+  }
+
+  const clearAssignment = async () => {
+    await client.query(
+      `
+        UPDATE tickets
+        SET teamspace_assignment_rule_id = NULL,
+            teamspace_assignment_project = NULL,
+            teamspace_assignment_synced_at = now()
+        WHERE id = $1;
+      `,
+      [ticketId]
+    );
+  };
+
+  if (
+    normalizedTeamspaceProjectList(incomingTeamspaceProjects).length > 0
+    || await ticketHasConcreteTeamspaceProject(client, ticketId)
+  ) {
+    await clearAssignment();
+    return null;
+  }
+
+  const organizationId = ticket.organization_id ? Number(ticket.organization_id) : null;
+
+  const rule = organizationId && ticket.work_type
+    ? await findMatchingTeamspaceAssignmentRule(client, organizationId, ticket.work_type)
+    : null;
+
+  if (!rule) {
+    await clearAssignment();
+
+    if (ticket.work_type === "support" && ticket.atoss_support) {
+      const assignedSessions = await assignAtossSupportSessions(client, ticketId);
+      return {
+        id: null,
+        name: "Atoss Support",
+        teamspace_project: null,
+        projectTeamspaceEntryId: null,
+        assignedSessions
+      };
+    }
+
+    await clearAtossSupportSessionAssignments(client, ticketId);
+    return null;
+  }
+
+  const entryId = await ensureTeamspaceEntryForAssignmentTarget(client, rule.teamspace_project, ticket.user_id);
+
+  await client.query(
+    `
+      UPDATE tickets
+      SET teamspace_assignment_rule_id = $2,
+          teamspace_assignment_project = $3,
+          teamspace_assignment_synced_at = now()
+      WHERE id = $1;
+    `,
+    [ticketId, rule.id, rule.teamspace_project]
+  );
+  const sessionsResult = await client.query(
+    `
+      UPDATE sessions
+      SET project_teamspace_entry_id = $2
+      WHERE ticket_id = $1
+        AND project_teamspace_entry_id IS DISTINCT FROM $2::bigint;
+    `,
+    [ticketId, entryId]
+  );
+
+  return {
+    ...rule,
+    projectTeamspaceEntryId: entryId,
+    assignedSessions: sessionsResult.rowCount ?? 0
+  };
+}
+
 async function autoAssignSingleProjectTeamspaceEntry(client: QueryClient, ticketId: string, userId: string | null = null) {
   await client.query(
     `
       WITH single_entry_projects AS (
         SELECT
+          p.id AS project_id,
           p.user_id,
           p.ticket_id,
           MIN(pte.id) AS project_teamspace_entry_id
@@ -4272,16 +5031,26 @@ async function autoAssignSingleProjectTeamspaceEntry(client: QueryClient, ticket
         JOIN project_teamspace_entries pte ON pte.project_id = p.id
         WHERE p.ticket_id = $1
           AND ($2::bigint IS NULL OR p.user_id = $2)
+          AND pte.teamspace_project IS NOT NULL
+          AND btrim(pte.teamspace_project) <> ''
         GROUP BY p.id, p.user_id, p.ticket_id
         HAVING COUNT(pte.id) = 1
       )
       UPDATE sessions s
       SET project_teamspace_entry_id = sep.project_teamspace_entry_id
       FROM single_entry_projects sep
-	      WHERE s.ticket_id = sep.ticket_id
-	        AND s.user_id = sep.user_id
-	        AND s.work_type = 'consulting'
-	        AND s.project_teamspace_entry_id IS NULL;
+      WHERE s.ticket_id = sep.ticket_id
+        AND s.user_id = sep.user_id
+        AND s.work_type = 'consulting'
+        AND (
+          s.project_teamspace_entry_id IS NULL
+          OR NOT EXISTS (
+            SELECT 1
+            FROM project_teamspace_entries current_pte
+            WHERE current_pte.id = s.project_teamspace_entry_id
+              AND current_pte.project_id = sep.project_id
+          )
+        );
     `,
     [ticketId, userId]
   );
@@ -4295,16 +5064,59 @@ async function autoAssignSingleProjectTeamspaceEntry(client: QueryClient, ticket
         FROM projects p
         JOIN project_teamspace_entries pte ON pte.project_id = p.id
         WHERE p.ticket_id = $1
+          AND pte.teamspace_project IS NOT NULL
+          AND btrim(pte.teamspace_project) <> ''
         GROUP BY p.ticket_id
         HAVING COUNT(pte.id) = 1
       )
       UPDATE sessions s
       SET project_teamspace_entry_id = single_ticket.project_teamspace_entry_id
       FROM single_entry_tickets single_ticket
-	      WHERE s.ticket_id = single_ticket.ticket_id
-	        AND s.work_type = 'consulting'
-	        AND s.project_teamspace_entry_id IS NULL
-	        AND ($2::bigint IS NULL OR s.user_id = $2);
+      WHERE s.ticket_id = single_ticket.ticket_id
+        AND s.work_type = 'consulting'
+        AND ($2::bigint IS NULL OR s.user_id = $2)
+        AND (
+          s.project_teamspace_entry_id IS NULL
+          OR NOT EXISTS (
+            SELECT 1
+            FROM project_teamspace_entries current_pte
+            JOIN projects current_project ON current_project.id = current_pte.project_id
+            WHERE current_pte.id = s.project_teamspace_entry_id
+              AND current_project.ticket_id = single_ticket.ticket_id
+          )
+        );
+    `,
+    [ticketId, userId]
+  );
+
+  await client.query(
+    `
+      WITH multiple_entry_tickets AS (
+        SELECT p.ticket_id
+        FROM projects p
+        JOIN project_teamspace_entries pte ON pte.project_id = p.id
+        WHERE p.ticket_id = $1
+          AND pte.teamspace_project IS NOT NULL
+          AND btrim(pte.teamspace_project) <> ''
+        GROUP BY p.ticket_id
+        HAVING COUNT(pte.id) > 1
+      )
+      UPDATE sessions session
+      SET project_teamspace_entry_id = NULL
+      FROM multiple_entry_tickets multiple_ticket
+      WHERE session.ticket_id = multiple_ticket.ticket_id
+        AND session.work_type = 'consulting'
+        AND ($2::bigint IS NULL OR session.user_id = $2)
+        AND session.project_teamspace_entry_id IS NOT NULL
+        AND NOT EXISTS (
+          SELECT 1
+          FROM project_teamspace_entries current_entry
+          JOIN projects current_project ON current_project.id = current_entry.project_id
+          WHERE current_entry.id = session.project_teamspace_entry_id
+            AND current_project.ticket_id = multiple_ticket.ticket_id
+            AND current_entry.teamspace_project IS NOT NULL
+            AND btrim(current_entry.teamspace_project) <> ''
+        );
     `,
     [ticketId, userId]
   );
@@ -4885,6 +5697,7 @@ type TeamspaceRemoteProject = {
   apiProjectUrl: string | null;
   mainProjectApiProjectId: number | null;
   parentApiProjectId: number | null;
+  customerApiId: number | null;
   billingType: string | null;
   name: string | null;
   customerName: string | null;
@@ -4919,7 +5732,9 @@ type TeamspaceProjectIdSyncItem = {
 type TeamspaceProjectIdSyncPosition = {
   apiProjectId: string;
   projectId: string | null;
+  mainProjectId?: string | null;
   label: string;
+  customerName?: string | null;
   isSubentry: boolean;
   billingType?: string | null;
   minutes: number;
@@ -5126,6 +5941,7 @@ function teamspaceRemoteProjectFromItem(item: unknown): TeamspaceRemoteProject |
     apiProjectUrl: teamspaceString(data._url) ?? teamspaceString(item.href),
     mainProjectApiProjectId: teamspaceLinkApiProjectId(data.mainProject),
     parentApiProjectId: teamspaceLinkApiProjectId(data.parent),
+    customerApiId: teamspaceLinkApiProjectId(data.customer),
     billingType: teamspaceBillingType(data),
     name: teamspaceString(data.name),
     customerName: teamspaceProjectCustomerName(data),
@@ -5220,6 +6036,76 @@ async function loadTeamspaceRemoteSubprojectsSingleCall(baseUrl: string, deviceI
   };
 }
 
+async function loadTeamspaceRemoteProjectsByApiId(
+  baseUrl: string,
+  deviceId: string,
+  devicePassword: string,
+  apiProjectIds: Iterable<number>
+) {
+  const ids = [...new Set(Array.from(apiProjectIds).filter((id) => Number.isInteger(id) && id > 0))];
+  const projects = new Map<number, TeamspaceRemoteProject>();
+
+  // Teamspace ignores an _id filter on the collection endpoint. Direct lookups
+  // are therefore required to resolve IDs returned by the time API reliably.
+  for (let offset = 0; offset < ids.length; offset += 8) {
+    const chunk = ids.slice(offset, offset + 8);
+    const resolved = await Promise.all(chunk.map(async (apiProjectId) => {
+      try {
+        const payload = await fetchTeamspaceJson(baseUrl, deviceId, devicePassword, `/api/project/${apiProjectId}`);
+        const project = teamspaceRemoteProjectFromItem(payload);
+        return project?.apiProjectId === apiProjectId ? project : null;
+      } catch {
+        return null;
+      }
+    }));
+
+    for (const project of resolved) {
+      if (project) {
+        projects.set(project.apiProjectId, project);
+      }
+    }
+  }
+
+  const customerIds = [...new Set(Array.from(projects.values())
+    .map((project) => project.customerApiId)
+    .filter((id): id is number => id !== null))];
+  const customerNames = new Map<number, string>();
+
+  for (let offset = 0; offset < customerIds.length; offset += 8) {
+    const chunk = customerIds.slice(offset, offset + 8);
+    const resolved = await Promise.all(chunk.map(async (customerApiId) => {
+      try {
+        const payload = await fetchTeamspaceJson(baseUrl, deviceId, devicePassword, `/api/organization/${customerApiId}`);
+        if (!isPlainObject(payload)) {
+          return null;
+        }
+
+        const data = isPlainObject(payload.data) ? payload.data : payload;
+        const name = teamspaceString(data.name) ?? teamspaceString(data.companyName) ?? teamspaceString(data.displayName);
+        return name ? { customerApiId, name } : null;
+      } catch {
+        return null;
+      }
+    }));
+
+    for (const customer of resolved) {
+      if (customer) {
+        customerNames.set(customer.customerApiId, customer.name);
+      }
+    }
+  }
+
+  for (const [apiProjectId, project] of projects) {
+    const customerName = project.customerApiId ? customerNames.get(project.customerApiId) : null;
+
+    if (customerName) {
+      projects.set(apiProjectId, { ...project, customerName });
+    }
+  }
+
+  return projects;
+}
+
 function teamspaceRemoteProjectsByProjectId(projects: TeamspaceRemoteProject[]) {
   const byProjectId = new Map<string, TeamspaceRemoteProject[]>();
 
@@ -5247,6 +6133,8 @@ function teamspaceRemoteProjectsByMainprojectId(projects: TeamspaceRemoteProject
 type TeamspaceRemoteTimeActual = {
   projectApiId: number;
   day: string | null;
+  description: string | null;
+  ticketNumber: string | null;
   minutes: number;
   billableMinutes: number;
 };
@@ -5258,6 +6146,13 @@ type TeamspaceTimeActualTotal = {
   days: Map<string, { minutes: number; billableMinutes: number; count: number }>;
 };
 
+type TeamspaceTimeActualSourcePosition = {
+  projectApiId: number;
+  ticketNumber: string | null;
+  description: string | null;
+  actual: TeamspaceTimeActualTotal;
+};
+
 function currentBerlinMonthLabel() {
   const parts = new Intl.DateTimeFormat("en-CA", {
     timeZone: "Europe/Berlin",
@@ -5320,6 +6215,23 @@ function teamspaceTimeDay(value: unknown) {
   return match?.[0] ?? null;
 }
 
+function teamspaceTimeDescription(data: Record<string, unknown>) {
+  for (const value of [data.description, data.comment, data.note, data.text, data.subject, data.title]) {
+    const description = teamspaceLinkedLabel(value);
+
+    if (description) {
+      return description;
+    }
+  }
+
+  return null;
+}
+
+function teamspaceTicketNumberFromText(value: string | null) {
+  const match = value?.match(/ticket#([0-9]{6})/i);
+  return match ? `Ticket#${match[1]}` : null;
+}
+
 function teamspaceRemoteTimeActualFromItem(item: unknown): TeamspaceRemoteTimeActual | null {
   if (!isPlainObject(item)) {
     return null;
@@ -5340,10 +6252,13 @@ function teamspaceRemoteTimeActualFromItem(item: unknown): TeamspaceRemoteTimeAc
 
   const minutes = teamspaceOptionalInteger(data.amount) ?? 0;
   const billableMinutes = teamspaceOptionalInteger(data.amountBillable) ?? minutes;
+  const description = teamspaceTimeDescription(data);
 
   return {
     projectApiId,
     day: teamspaceTimeDay(data.date),
+    description,
+    ticketNumber: teamspaceTicketNumberFromText(description),
     minutes: Math.max(0, minutes),
     billableMinutes: Math.max(0, billableMinutes)
   };
@@ -5360,20 +6275,60 @@ function teamspaceTimeActualDays(total: TeamspaceTimeActualTotal | undefined) {
     .sort((left, right) => left.day.localeCompare(right.day));
 }
 
-function teamspaceTimeActualSummary(timeActuals: { totals: Map<number, TeamspaceTimeActualTotal> }) {
-  const positions = Array.from(timeActuals.totals.entries())
-    .map(([apiProjectId, actual]) => ({
-      apiProjectId: String(apiProjectId),
-      projectId: null,
-      label: `API ${apiProjectId}`,
-      isSubentry: false,
-      billingType: null,
-      minutes: actual.minutes,
-      billableMinutes: actual.billableMinutes,
-      entryCount: actual.count,
-      days: teamspaceTimeActualDays(actual)
-    }))
-    .sort((left, right) => Number(left.apiProjectId) - Number(right.apiProjectId));
+function addTeamspaceTimeActual(total: TeamspaceTimeActualTotal, actual: TeamspaceRemoteTimeActual) {
+  total.minutes += actual.minutes;
+  total.billableMinutes += actual.billableMinutes;
+  total.count += 1;
+
+  if (actual.day) {
+    const day = total.days.get(actual.day) ?? { minutes: 0, billableMinutes: 0, count: 0 };
+    day.minutes += actual.minutes;
+    day.billableMinutes += actual.billableMinutes;
+    day.count += 1;
+    total.days.set(actual.day, day);
+  }
+}
+
+function teamspaceTimeActualSummary(timeActuals: {
+  totals: Map<number, TeamspaceTimeActualTotal>;
+  projectsByApiId?: Map<number, TeamspaceRemoteProject>;
+  sourceTotals?: Map<number, TeamspaceTimeActualTotal>;
+  sourceProjectsByApiId?: Map<number, TeamspaceRemoteProject>;
+  sourcePositions?: TeamspaceTimeActualSourcePosition[];
+}) {
+  const positionProjects = timeActuals.sourceProjectsByApiId ?? timeActuals.projectsByApiId;
+  const positionValues = timeActuals.sourcePositions
+    ?? Array.from(timeActuals.sourceTotals ?? timeActuals.totals, ([projectApiId, actual]) => ({
+      projectApiId,
+      ticketNumber: null,
+      description: null,
+      actual
+    }));
+  const positions = positionValues
+    .map((position) => {
+      const { projectApiId, ticketNumber, description, actual } = position;
+      const project = positionProjects?.get(projectApiId);
+      const mainProjectId = project?.mainprojectId ?? project?.projectId ?? null;
+      const label = description || project?.name || project?.description || project?.projectId || `API ${projectApiId}`;
+
+      return {
+        apiProjectId: String(projectApiId),
+        projectId: mainProjectId,
+        mainProjectId,
+        label,
+        description: description || project?.description || null,
+        ticketNumber,
+        customerName: project?.customerName ?? null,
+        isSubentry: Boolean(project?.mainProjectApiProjectId && project.mainProjectApiProjectId !== projectApiId),
+        billingType: project?.billingType ?? null,
+        minutes: actual.minutes,
+        billableMinutes: actual.billableMinutes,
+        entryCount: actual.count,
+        days: teamspaceTimeActualDays(actual)
+      };
+    })
+    .sort((left, right) => Number(left.apiProjectId) - Number(right.apiProjectId)
+      || String(left.ticketNumber ?? "").localeCompare(String(right.ticketNumber ?? "")));
 
   return positions.reduce((summary, position) => ({
     minutes: summary.minutes + position.minutes,
@@ -5387,7 +6342,13 @@ async function upsertTeamspaceMonthlyUserActuals(
   client: QueryClient,
   userId: string,
   month: ReturnType<typeof parseMonth>,
-  timeActuals: { totals: Map<number, TeamspaceTimeActualTotal> }
+  timeActuals: {
+    totals: Map<number, TeamspaceTimeActualTotal>;
+    projectsByApiId?: Map<number, TeamspaceRemoteProject>;
+    sourceTotals?: Map<number, TeamspaceTimeActualTotal>;
+    sourceProjectsByApiId?: Map<number, TeamspaceRemoteProject>;
+    sourcePositions?: TeamspaceTimeActualSourcePosition[];
+  }
 ) {
   const summary = teamspaceTimeActualSummary(timeActuals);
 
@@ -5444,27 +6405,100 @@ async function loadTeamspaceRemoteTimeActualsSingleCall(baseUrl: string, deviceI
   }
 
   const totals = new Map<number, TeamspaceTimeActualTotal>();
+  const sourcePositionsByKey = new Map<string, TeamspaceTimeActualSourcePosition>();
+  const actuals = items.map(teamspaceRemoteTimeActualFromItem).filter((entry): entry is TeamspaceRemoteTimeActual => Boolean(entry));
 
-  for (const actual of items.map(teamspaceRemoteTimeActualFromItem).filter((entry): entry is TeamspaceRemoteTimeActual => Boolean(entry))) {
+  for (const actual of actuals) {
     const current = totals.get(actual.projectApiId) ?? { minutes: 0, billableMinutes: 0, count: 0, days: new Map<string, { minutes: number; billableMinutes: number; count: number }>() };
-    current.minutes += actual.minutes;
-    current.billableMinutes += actual.billableMinutes;
-    current.count += 1;
+    addTeamspaceTimeActual(current, actual);
+    totals.set(actual.projectApiId, current);
 
-    if (actual.day) {
-      const day = current.days.get(actual.day) ?? { minutes: 0, billableMinutes: 0, count: 0 };
-      day.minutes += actual.minutes;
-      day.billableMinutes += actual.billableMinutes;
-      day.count += 1;
-      current.days.set(actual.day, day);
+    const sourcePositionKey = `${actual.projectApiId}:${actual.ticketNumber ?? ""}`;
+    const sourcePosition = sourcePositionsByKey.get(sourcePositionKey) ?? {
+      projectApiId: actual.projectApiId,
+      ticketNumber: actual.ticketNumber,
+      description: actual.description,
+      actual: { minutes: 0, billableMinutes: 0, count: 0, days: new Map<string, { minutes: number; billableMinutes: number; count: number }>() }
+    };
+    sourcePosition.description ??= actual.description;
+    addTeamspaceTimeActual(sourcePosition.actual, actual);
+    sourcePositionsByKey.set(sourcePositionKey, sourcePosition);
+  }
+
+  const sourceProjectsByApiId = await loadTeamspaceRemoteProjectsByApiId(
+    baseUrl,
+    deviceId,
+    devicePassword,
+    totals.keys()
+  );
+  const unresolvedSourceApiIds = Array.from(totals.keys()).filter((apiProjectId) => !sourceProjectsByApiId.has(apiProjectId));
+
+  if (unresolvedSourceApiIds.length > 0) {
+    throw Object.assign(
+      new Error(`Teamspace-Projekt-ID(s) konnten nicht auf das Hauptprojekt aufgelöst werden: ${unresolvedSourceApiIds.join(", ")}`),
+      { status: 502 }
+    );
+  }
+
+  const mainProjectIds = new Set(Array.from(totals.keys()).map((apiProjectId) => {
+    const project = sourceProjectsByApiId.get(apiProjectId);
+    return project?.mainProjectApiProjectId ?? apiProjectId;
+  }));
+  const mainProjectsByApiId = await loadTeamspaceRemoteProjectsByApiId(
+    baseUrl,
+    deviceId,
+    devicePassword,
+    mainProjectIds
+  );
+  const unresolvedMainApiIds = Array.from(mainProjectIds).filter((apiProjectId) => !mainProjectsByApiId.has(apiProjectId));
+
+  if (unresolvedMainApiIds.length > 0) {
+    throw Object.assign(
+      new Error(`Teamspace-Hauptprojekt-ID(s) konnten nicht aufgelöst werden: ${unresolvedMainApiIds.join(", ")}`),
+      { status: 502 }
+    );
+  }
+
+  const normalizedTotals = new Map<number, TeamspaceTimeActualTotal>();
+  const projectsByApiId = new Map<number, TeamspaceRemoteProject>();
+
+  for (const [sourceApiProjectId, sourceTotal] of totals) {
+    const sourceProject = sourceProjectsByApiId.get(sourceApiProjectId);
+    const mainApiProjectId = sourceProject?.mainProjectApiProjectId ?? sourceApiProjectId;
+    const current = normalizedTotals.get(mainApiProjectId) ?? {
+      minutes: 0,
+      billableMinutes: 0,
+      count: 0,
+      days: new Map<string, { minutes: number; billableMinutes: number; count: number }>()
+    };
+    current.minutes += sourceTotal.minutes;
+    current.billableMinutes += sourceTotal.billableMinutes;
+    current.count += sourceTotal.count;
+
+    for (const [dayLabel, sourceDay] of sourceTotal.days) {
+      const day = current.days.get(dayLabel) ?? { minutes: 0, billableMinutes: 0, count: 0 };
+      day.minutes += sourceDay.minutes;
+      day.billableMinutes += sourceDay.billableMinutes;
+      day.count += sourceDay.count;
+      current.days.set(dayLabel, day);
     }
 
-    totals.set(actual.projectApiId, current);
+    normalizedTotals.set(mainApiProjectId, current);
+    const mainProject = mainProjectsByApiId.get(mainApiProjectId)
+      ?? (sourceProject?.apiProjectId === mainApiProjectId ? sourceProject : null);
+
+    if (mainProject) {
+      projectsByApiId.set(mainApiProjectId, mainProject);
+    }
   }
 
   return {
     scanned: items.length,
-    totals
+    totals: normalizedTotals,
+    projectsByApiId,
+    sourceTotals: totals,
+    sourceProjectsByApiId,
+    sourcePositions: Array.from(sourcePositionsByKey.values())
   };
 }
 
@@ -5486,6 +6520,16 @@ function monthLabelsForDateRange(startDate: string, endExclusiveDate: string) {
   return labels;
 }
 
+function addMonthsToMonthLabel(monthLabel: string, amount: number) {
+  const date = new Date(`${monthLabel}-01T00:00:00.000Z`);
+  date.setUTCMonth(date.getUTCMonth() + amount);
+  return date.toISOString().slice(0, 7);
+}
+
+function compareMonthLabels(left: string, right: string) {
+  return left.localeCompare(right);
+}
+
 async function syncTeamspaceMonthlyActualsForEntries(
   userId: string,
   credentials: Awaited<ReturnType<typeof getTeamspaceCredentialsForUser>>,
@@ -5493,14 +6537,6 @@ async function syncTeamspaceMonthlyActualsForEntries(
   month: ReturnType<typeof parseMonth>,
   entries: TeamspaceMonthlyActualSyncEntry[]
 ) {
-  if (entries.length === 0) {
-    return {
-      scanned: 0,
-      mapped: 0,
-      billableMinutes: 0
-    };
-  }
-
   const timeActuals = await loadTeamspaceRemoteTimeActualsSingleCall(
     credentials.baseUrl,
     credentials.deviceId,
@@ -5519,44 +6555,18 @@ async function syncTeamspaceMonthlyActualsForEntries(
     billing_type: string | null;
   }>(
     `
-      SELECT DISTINCT ON (entry_id, api_project_id)
-        entry_id,
-        api_project_id::text AS api_project_id,
-        project_id,
-        label,
-        is_subentry,
-        billing_type
-      FROM (
-        SELECT
-          pte.id::text AS entry_id,
-          pte.teamspace_api_project_id AS api_project_id,
-          pte.teamspace_project AS project_id,
-          NULLIF(btrim(pte.teamspace_description), '') AS label,
-          false AS is_subentry,
-          NULL::text AS billing_type,
-          0 AS display_order
-        FROM project_teamspace_entries pte
-        WHERE pte.id = ANY($2::bigint[])
-          AND pte.teamspace_api_project_id IS NOT NULL
-
-        UNION ALL
-
-        SELECT
-          pte.id::text AS entry_id,
-          pts.teamspace_api_project_id AS api_project_id,
-          pts.teamspace_project_id AS project_id,
-          COALESCE(NULLIF(btrim(pts.alias), ''), NULLIF(btrim(pts.name), ''), pts.teamspace_project_id) AS label,
-          true AS is_subentry,
-          pts.billing_type,
-          pts.display_order + 1 AS display_order
-        FROM project_teamspace_entries pte
-        JOIN project_teamspace_subentries pts ON pts.project_teamspace_entry_id = pte.id
-        WHERE pte.id = ANY($2::bigint[])
-          AND pts.user_id = $1
-      ) api_ids
-      ORDER BY entry_id, api_project_id, display_order ASC;
+      SELECT
+        pte.id::text AS entry_id,
+        pte.teamspace_api_project_id::text AS api_project_id,
+        pte.teamspace_project AS project_id,
+        NULLIF(btrim(pte.teamspace_description), '') AS label,
+        false AS is_subentry,
+        NULL::text AS billing_type
+      FROM project_teamspace_entries pte
+      WHERE pte.id = ANY($1::bigint[])
+        AND pte.teamspace_api_project_id IS NOT NULL;
     `,
-    [userId, entryIds]
+    [entryIds]
   );
   const apiRowsByEntryId = new Map<string, typeof entryApiIdsResult.rows>();
 
@@ -5661,6 +6671,335 @@ async function syncTeamspaceMonthlyActualsForEntries(
   }, { scanned: timeActuals.scanned, mapped: 0, billableMinutes: 0 });
 }
 
+type TeamspaceInitialActualsResult = {
+  userId: string;
+  fromMonth: string;
+  toMonth: string;
+  checkedEntries: number;
+  matchedEntries: number;
+  updatedProjectIds: number;
+  missingEntries: number;
+  ambiguousEntries: number;
+  monthsChecked: number;
+  monthsSkippedClosed: number;
+  teamspaceTimeEntriesScanned: number;
+  updatedManualEntries: number;
+  importedManualMinutes: number;
+  existingDayBillingMinutes: number;
+};
+
+async function runTeamspaceInitialActualsSyncForUser(userId: string, adminUserId: string, requestedFromMonth: string | null, requestedToMonth: string | null): Promise<TeamspaceInitialActualsResult> {
+  const userResult = await query<{
+    id: string;
+    active: boolean;
+    teamspace_user_id: string | null;
+    has_teamspace_credentials: boolean;
+    teamspace_initial_actuals_synced_at: string | null;
+    teamspace_initial_actuals_unlocked_at: string | null;
+  }>(
+    `
+      SELECT id::text AS id,
+             active,
+             teamspace_user_id::text AS teamspace_user_id,
+             (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials,
+             teamspace_initial_actuals_synced_at::text AS teamspace_initial_actuals_synced_at,
+             teamspace_initial_actuals_unlocked_at::text AS teamspace_initial_actuals_unlocked_at
+      FROM users
+      WHERE id = $1
+        AND role = 'user';
+    `,
+    [userId]
+  );
+  const targetUser = userResult.rows[0];
+
+  if (!targetUser) {
+    throw Object.assign(new Error("User not found"), { status: 404 });
+  }
+
+  if (!targetUser.active) {
+    throw badRequest("Der Benutzer ist inaktiv");
+  }
+
+  if (!targetUser.teamspace_user_id || !targetUser.has_teamspace_credentials) {
+    throw badRequest("Der Benutzer braucht Teamspace User-ID und Geräte-Credentials");
+  }
+
+  if (
+    targetUser.teamspace_initial_actuals_synced_at &&
+    (!targetUser.teamspace_initial_actuals_unlocked_at || targetUser.teamspace_initial_actuals_unlocked_at <= targetUser.teamspace_initial_actuals_synced_at)
+  ) {
+    throw Object.assign(new Error("Der initiale Teamspace-Istzeiten-Sync ist für diesen Benutzer gesperrt"), { status: 409 });
+  }
+
+  const entriesResult = await query<{
+    project_id: string;
+    ticket_id: string;
+    ticket_number: string;
+    entry_id: string;
+    teamspace_project: string;
+    teamspace_api_project_id: string | null;
+    teamspace_api_project_url: string | null;
+    is_default: boolean;
+    starts_month: string | null;
+  }>(
+    `
+      SELECT
+        p.id::text AS project_id,
+        p.ticket_id::text AS ticket_id,
+        t.ticket_number,
+        pte.id::text AS entry_id,
+        btrim(pte.teamspace_project) AS teamspace_project,
+        pte.teamspace_api_project_id::text AS teamspace_api_project_id,
+        pte.teamspace_api_project_url,
+        pte.is_default,
+        to_char(date_trunc('month', p.starts_on), 'YYYY-MM') AS starts_month
+      FROM projects p
+      JOIN tickets t ON t.id = p.ticket_id
+      JOIN project_teamspace_entries pte ON pte.project_id = p.id
+      WHERE p.user_id = $1
+        AND p.closed_at IS NULL
+        AND t.work_type = 'consulting'
+        AND pte.teamspace_project IS NOT NULL
+        AND btrim(pte.teamspace_project) <> ''
+      ORDER BY t.ticket_number ASC, pte.display_order ASC, pte.id ASC;
+    `,
+    [userId]
+  );
+
+  const toMonth = requestedToMonth ? parseMonth(requestedToMonth).label : currentBerlinMonthLabel();
+  const inferredStartMonth = entriesResult.rows
+    .map((entry) => entry.starts_month)
+    .filter((month): month is string => Boolean(month))
+    .sort()[0] ?? addMonthsToMonthLabel(toMonth, -24);
+  const fromMonth = requestedFromMonth ? parseMonth(requestedFromMonth).label : inferredStartMonth;
+
+  if (compareMonthLabels(fromMonth, toMonth) > 0) {
+    throw badRequest("fromMonth must not be after toMonth");
+  }
+
+  const credentials = await getTeamspaceCredentialsForUser(userId);
+  const remote = await loadTeamspaceRemoteProjectsSingleCall(
+    credentials.baseUrl,
+    credentials.deviceId,
+    credentials.devicePassword,
+    entriesResult.rows.map((entry) => entry.teamspace_project)
+  );
+  const remoteByProjectId = teamspaceRemoteProjectsByProjectId(remote.projects);
+  const remoteByMainprojectId = teamspaceRemoteProjectsByMainprojectId(remote.projects);
+  const matchedEntries: TeamspaceSubentrySyncEntry[] = [];
+  const monthEntries: TeamspaceMonthlyActualSyncEntry[] = [];
+  let missingEntries = 0;
+  let ambiguousEntries = 0;
+  let updatedProjectIds = 0;
+
+  await withTransaction(async (client) => {
+    const touchedProjects = new Set<string>();
+
+    for (const entry of entriesResult.rows) {
+      let matches = teamspaceProjectMatchesForLocalId(entry.teamspace_project, remoteByProjectId, remoteByMainprojectId);
+      const previousApiMatch = entry.teamspace_api_project_id
+        ? matches.filter((match) => String(match.apiProjectId) === entry.teamspace_api_project_id)
+        : [];
+
+      if (previousApiMatch.length === 1) {
+        matches = previousApiMatch;
+      }
+
+      if (matches.length === 0) {
+        missingEntries += 1;
+        continue;
+      }
+
+      if (matches.length > 1) {
+        ambiguousEntries += 1;
+        continue;
+      }
+
+      const [match] = matches;
+      const nextApiProjectUrl = match.apiProjectUrl ?? `${credentials.baseUrl}/api/project/${match.apiProjectId}`;
+      const nextBudgetMinutes = teamspaceHourBudgetMinutes(match);
+      await client.query(
+        `
+          UPDATE project_teamspace_entries
+          SET teamspace_api_project_id = $1,
+              teamspace_api_project_url = $2,
+              hour_budget_minutes = $3,
+              budget_sync_disabled = false,
+              updated_at = now()
+          WHERE id = $4;
+        `,
+        [match.apiProjectId, nextApiProjectUrl, nextBudgetMinutes, entry.entry_id]
+      );
+      touchedProjects.add(entry.project_id);
+      matchedEntries.push({
+        project_id: entry.project_id,
+        entry_id: entry.entry_id,
+        teamspace_project: entry.teamspace_project,
+        teamspace_api_project_id: String(match.apiProjectId)
+      });
+      monthEntries.push({
+        entryId: entry.entry_id,
+        apiProjectId: match.apiProjectId
+      });
+    }
+
+    await consolidateSharedTeamspaceProjectData(client, entriesResult.rows.map((entry) => entry.teamspace_project));
+
+    for (const projectId of touchedProjects) {
+      await refreshProjectBudgetFromTeamspaceEntries(client, projectId);
+    }
+
+    updatedProjectIds = touchedProjects.size;
+  });
+
+  let monthsChecked = 0;
+  let monthsSkippedClosed = 0;
+  let teamspaceTimeEntriesScanned = 0;
+  const importedMinutesByEntryId = new Map<string, number>();
+
+  for (let monthLabel = fromMonth; compareMonthLabels(monthLabel, toMonth) <= 0; monthLabel = addMonthsToMonthLabel(monthLabel, 1)) {
+    const month = parseMonth(monthLabel);
+    monthsChecked += 1;
+
+    const closureResult = await query<{ closed_at: string }>(
+      `
+        SELECT closed_at
+        FROM month_closures
+        WHERE user_id = $1
+          AND month = $2::date;
+      `,
+      [userId, month.start]
+    );
+
+    if (closureResult.rowCount && closureResult.rowCount > 0) {
+      monthsSkippedClosed += 1;
+      continue;
+    }
+
+    const monthSync = await syncTeamspaceMonthlyActualsForEntries(userId, credentials, targetUser.teamspace_user_id, month, monthEntries);
+    teamspaceTimeEntriesScanned += monthSync.scanned;
+
+    const actualsResult = await query<{
+      project_teamspace_entry_id: string;
+      teamspace_billable_minutes: number;
+    }>(
+      `
+        SELECT project_teamspace_entry_id::text AS project_teamspace_entry_id,
+               teamspace_billable_minutes
+        FROM project_teamspace_monthly_actuals
+        WHERE user_id = $1
+          AND month = $2::date
+          AND project_teamspace_entry_id = ANY($3::bigint[]);
+      `,
+      [userId, month.start, monthEntries.map((entry) => entry.entryId)]
+    );
+
+    for (const actual of actualsResult.rows) {
+      importedMinutesByEntryId.set(
+        actual.project_teamspace_entry_id,
+        (importedMinutesByEntryId.get(actual.project_teamspace_entry_id) ?? 0) + Number(actual.teamspace_billable_minutes ?? 0)
+      );
+    }
+  }
+
+  const localDayValuesResult = await query<{
+    entry_id: string;
+    local_day_minutes: number;
+  }>(
+    `
+      SELECT
+        pte.id::text AS entry_id,
+        COALESCE(SUM(tdb.billed_minutes), 0)::int AS local_day_minutes
+      FROM project_teamspace_entries pte
+      JOIN projects p ON p.id = pte.project_id
+      LEFT JOIN ticket_day_billings tdb
+        ON tdb.ticket_id = p.ticket_id
+       AND tdb.user_id = $1
+       AND tdb.day >= $2::date
+       AND tdb.day < ($3::date + interval '1 month')::date
+       AND (
+         tdb.project_teamspace_entry_id = pte.id
+         OR (pte.is_default AND tdb.project_teamspace_entry_id IS NULL)
+       )
+       AND NOT EXISTS (
+         SELECT 1
+         FROM month_closures mc
+         WHERE mc.user_id = $1
+           AND mc.month = date_trunc('month', tdb.day)::date
+       )
+      WHERE pte.id = ANY($4::bigint[])
+      GROUP BY pte.id;
+    `,
+    [userId, `${fromMonth}-01`, `${toMonth}-01`, monthEntries.map((entry) => entry.entryId)]
+  );
+  const localDayMinutesByEntryId = new Map(localDayValuesResult.rows.map((row) => [row.entry_id, Number(row.local_day_minutes ?? 0)]));
+  let updatedManualEntries = 0;
+  let importedManualMinutes = 0;
+  let existingDayBillingMinutes = 0;
+
+  await withTransaction(async (client) => {
+    const touchedProjects = new Set<string>();
+
+    for (const entry of matchedEntries) {
+      const importedMinutes = importedMinutesByEntryId.get(entry.entry_id) ?? 0;
+      const localDayMinutes = localDayMinutesByEntryId.get(entry.entry_id) ?? 0;
+      const manualMinutes = Math.max(importedMinutes - localDayMinutes, 0);
+      const updateResult = await client.query<{ project_id: string; manual_consumption_minutes: number }>(
+        `
+          UPDATE project_teamspace_entries
+          SET manual_consumption_minutes = $1,
+              updated_at = CASE
+                WHEN manual_consumption_minutes IS DISTINCT FROM $1 THEN now()
+                ELSE updated_at
+              END
+          WHERE id = $2
+          RETURNING project_id::text AS project_id, manual_consumption_minutes;
+        `,
+        [manualMinutes, entry.entry_id]
+      );
+
+      if (updateResult.rowCount && updateResult.rowCount > 0) {
+        updatedManualEntries += 1;
+        importedManualMinutes += Number(updateResult.rows[0]?.manual_consumption_minutes ?? 0);
+        existingDayBillingMinutes += localDayMinutes;
+        touchedProjects.add(updateResult.rows[0].project_id);
+      }
+    }
+
+    for (const projectId of touchedProjects) {
+      await refreshProjectBudgetFromTeamspaceEntries(client, projectId);
+    }
+  });
+
+  await query(
+    `
+      UPDATE users
+      SET teamspace_initial_actuals_synced_at = now(),
+          teamspace_initial_actuals_synced_by = $2,
+          updated_at = now()
+      WHERE id = $1;
+    `,
+    [userId, adminUserId]
+  );
+
+  return {
+    userId,
+    fromMonth,
+    toMonth,
+    checkedEntries: entriesResult.rows.length,
+    matchedEntries: matchedEntries.length,
+    updatedProjectIds,
+    missingEntries,
+    ambiguousEntries,
+    monthsChecked,
+    monthsSkippedClosed,
+    teamspaceTimeEntriesScanned,
+    updatedManualEntries,
+    importedManualMinutes,
+    existingDayBillingMinutes
+  };
+}
+
 async function refreshTeamspaceActualsForActivePeriod(userId: string, period: ParsedPeriod, teamspaceTimeTrackingEnabled: boolean) {
   if (!teamspaceTimeTrackingEnabled) {
     return;
@@ -5698,9 +7037,7 @@ async function refreshTeamspaceActualsForActivePeriod(userId: string, period: Pa
         pte.teamspace_api_project_id::int AS "apiProjectId"
       FROM projects p
       JOIN project_teamspace_entries pte ON pte.project_id = p.id
-      LEFT JOIN teamspace_project_exclusions tpe ON lower(btrim(tpe.teamspace_project)) = lower(btrim(pte.teamspace_project))
       WHERE pte.teamspace_api_project_id IS NOT NULL
-        AND tpe.teamspace_project IS NULL
         AND (
           p.user_id = $1
           OR EXISTS (
@@ -5716,10 +7053,6 @@ async function refreshTeamspaceActualsForActivePeriod(userId: string, period: Pa
     [userId, period.startIso, period.endIso]
   );
 
-  if (entriesResult.rows.length === 0) {
-    return;
-  }
-
   for (const monthLabel of monthLabelsForDateRange(periodStart, periodEndExclusive)) {
     await syncTeamspaceMonthlyActualsForEntries(
       userId,
@@ -6421,16 +7754,22 @@ async function refreshProjectBudgetFromTeamspaceEntries(client: QueryClient, pro
     `
       UPDATE projects p
       SET hour_budget_minutes = entry_budget.hour_budget_minutes,
+          manual_consumption_minutes = entry_budget.manual_consumption_minutes,
           updated_at = now()
       FROM (
         SELECT
           project_id,
-          COALESCE(SUM(hour_budget_minutes) FILTER (WHERE hour_budget_minutes IS NOT NULL), NULL)::int AS hour_budget_minutes
+          COALESCE(SUM(hour_budget_minutes) FILTER (WHERE hour_budget_minutes IS NOT NULL), NULL)::int AS hour_budget_minutes,
+          COALESCE(SUM(manual_consumption_minutes), 0)::int AS manual_consumption_minutes
         FROM project_teamspace_entries
         WHERE project_id = $1
         GROUP BY project_id
       ) entry_budget
-      WHERE p.id = entry_budget.project_id;
+      WHERE p.id = entry_budget.project_id
+        AND (
+          p.hour_budget_minutes IS DISTINCT FROM entry_budget.hour_budget_minutes
+          OR p.manual_consumption_minutes IS DISTINCT FROM entry_budget.manual_consumption_minutes
+        );
     `,
     [projectId]
   );
@@ -6983,11 +8322,24 @@ async function syncProjectTeamspaceEntriesFromZammad(
   const firstZammadProject = zammadProjects[0];
   const firstZammadEntry = existingEntries.find((entry) => entry.teamspace_project?.trim() === firstZammadProject);
 
+  if (zammadProjects.length > 1 && blankEntries.length > 0) {
+    await client.query(
+      `
+        UPDATE sessions
+        SET project_teamspace_entry_id = NULL
+        WHERE project_teamspace_entry_id = ANY($1::bigint[]);
+      `,
+      [blankEntries.map((entry) => Number(entry.id))]
+    );
+  }
+
   if (blankEntries.length > 0 && firstZammadProject) {
     if (firstZammadEntry) {
       await mergeTeamspaceEntriesIntoTarget(client, blankEntries.map((entry) => entry.id), firstZammadEntry.id);
       await client.query("UPDATE project_teamspace_entries SET is_default = (id = $2), updated_at = now() WHERE project_id = $1;", [projectId, firstZammadEntry.id]);
-      await assignUnassignedProjectSessionsToTeamspaceEntry(client, projectId, firstZammadEntry.id);
+      if (zammadProjects.length === 1) {
+        await assignUnassignedProjectSessionsToTeamspaceEntry(client, projectId, firstZammadEntry.id);
+      }
       defaultEntry = { ...firstZammadEntry, is_default: true };
       existingEntries = existingEntries
         .filter((entry) => !blankEntries.some((blank) => blank.id === entry.id))
@@ -7009,7 +8361,9 @@ async function syncProjectTeamspaceEntriesFromZammad(
         `,
         [defaultEntry.id, firstZammadProject]
       );
-      await assignUnassignedProjectSessionsToTeamspaceEntry(client, projectId, defaultEntry.id);
+      if (zammadProjects.length === 1) {
+        await assignUnassignedProjectSessionsToTeamspaceEntry(client, projectId, defaultEntry.id);
+      }
       defaultEntry = { ...defaultEntry, teamspace_project: firstZammadProject, is_default: true };
       existingEntries = existingEntries
         .filter((entry) => !additionalBlankEntryIds.includes(entry.id))
@@ -7051,6 +8405,147 @@ async function syncProjectTeamspaceEntriesFromZammad(
   await consolidateSharedTeamspaceProjectData(client, zammadProjects);
 }
 
+async function plannedTeamspaceAssignmentChanges(
+  client: QueryClient,
+  ticketId: string,
+  organizationId: number | null,
+  workType: "support" | "consulting" | null,
+  incomingTeamspaceProjects: string[],
+  preferredUserId: string | null,
+  projectWillBeRemoved: boolean
+) {
+  const currentResult = await client.query<{
+    rule_id: string | null;
+    rule_name: string | null;
+    teamspace_project: string | null;
+  }>(
+    `
+      SELECT
+        ticket.teamspace_assignment_rule_id::text AS rule_id,
+        rule.name AS rule_name,
+        ticket.teamspace_assignment_project AS teamspace_project
+      FROM tickets ticket
+      LEFT JOIN teamspace_assignment_rules rule ON rule.id = ticket.teamspace_assignment_rule_id
+      WHERE ticket.id = $1;
+    `,
+    [ticketId]
+  );
+  const current = currentResult.rows[0] ?? null;
+  const concreteEntriesResult = projectWillBeRemoved
+    ? { rows: [] as Array<{ id: string; teamspace_project: string }> }
+    : await client.query<{ id: string; teamspace_project: string }>(
+        `
+          SELECT entry.id::text AS id, entry.teamspace_project
+          FROM projects project
+          JOIN project_teamspace_entries entry ON entry.project_id = project.id
+          WHERE project.ticket_id = $1
+            AND entry.teamspace_project IS NOT NULL
+            AND btrim(entry.teamspace_project) <> ''
+          ORDER BY entry.display_order ASC, entry.id ASC;
+        `,
+        [ticketId]
+      );
+  const concreteEntries = concreteEntriesResult.rows;
+  const hasConcreteProject = concreteEntries.length > 0;
+  const hasIncomingProject = normalizedTeamspaceProjectList(incomingTeamspaceProjects).length > 0;
+  const rule = !hasConcreteProject && !hasIncomingProject && organizationId && workType
+    ? await findMatchingTeamspaceAssignmentRule(client, organizationId, workType)
+    : null;
+  const changes: ZammadSyncChange[] = [];
+
+  if (!rule) {
+    if (current?.rule_id || current?.teamspace_project) {
+      changes.push({
+        field: "Automatische TS-Zuordnung",
+        from: current.teamspace_project ? `${current.teamspace_project}${current.rule_name ? ` (${current.rule_name})` : ""}` : current.rule_name,
+        to: null
+      });
+    }
+
+    if (concreteEntries.length === 1) {
+      const mismatchResult = await client.query<{ count: string }>(
+        `
+          SELECT COUNT(*)::text AS count
+          FROM sessions
+          WHERE ticket_id = $1
+            AND work_type = 'consulting'
+            AND project_teamspace_entry_id IS DISTINCT FROM $2::bigint;
+        `,
+        [ticketId, concreteEntries[0].id]
+      );
+      const mismatchCount = Number(mismatchResult.rows[0]?.count ?? 0);
+
+      if (mismatchCount > 0) {
+        changes.push({
+          field: "Session-Zuordnung",
+          from: `${mismatchCount} Session(s) abweichend oder ohne TS-Projekt`,
+          to: concreteEntries[0].teamspace_project
+        });
+      }
+    } else if (concreteEntries.length > 1) {
+      const invalidResult = await client.query<{ count: string }>(
+        `
+          SELECT COUNT(*)::text AS count
+          FROM sessions session
+          WHERE session.ticket_id = $1
+            AND session.work_type = 'consulting'
+            AND session.project_teamspace_entry_id IS NOT NULL
+            AND NOT EXISTS (
+              SELECT 1
+              FROM project_teamspace_entries entry
+              JOIN projects project ON project.id = entry.project_id
+              WHERE entry.id = session.project_teamspace_entry_id
+                AND project.ticket_id = $1
+            );
+        `,
+        [ticketId]
+      );
+      const invalidCount = Number(invalidResult.rows[0]?.count ?? 0);
+
+      if (invalidCount > 0) {
+        changes.push({
+          field: "Session-Zuordnung",
+          from: `${invalidCount} automatische Session-Zuordnung(en)`,
+          to: "manuelle Auswahl aus mehreren TS-Projekten"
+        });
+      }
+    }
+
+    return changes;
+  }
+
+  const entryId = await findTeamspaceEntryForProject(client, rule.teamspace_project, preferredUserId);
+
+  if (current?.rule_id !== rule.id || current?.teamspace_project?.trim().toLocaleLowerCase("de") !== rule.teamspace_project.trim().toLocaleLowerCase("de")) {
+    changes.push({
+      field: "Automatische TS-Zuordnung",
+      from: current?.teamspace_project ? `${current.teamspace_project}${current.rule_name ? ` (${current.rule_name})` : ""}` : null,
+      to: `${rule.teamspace_project} (${rule.name})`
+    });
+  }
+
+  const mismatchedSessionsResult = await client.query<{ count: string }>(
+    `
+      SELECT COUNT(*)::text AS count
+      FROM sessions
+      WHERE ticket_id = $1
+        AND ($2::bigint IS NULL OR project_teamspace_entry_id IS DISTINCT FROM $2::bigint);
+    `,
+    [ticketId, entryId]
+  );
+  const mismatchedSessions = Number(mismatchedSessionsResult.rows[0]?.count ?? 0);
+
+  if (mismatchedSessions > 0) {
+    changes.push({
+      field: "Session-Zuordnung",
+      from: `${mismatchedSessions} Session(s) abweichend oder ohne TS-Projekt`,
+      to: rule.teamspace_project
+    });
+  }
+
+  return changes;
+}
+
 async function planExistingZammadTicketSync(
   client: QueryClient,
   localTicket: LocalZammadSyncTicket,
@@ -7156,7 +8651,34 @@ async function planExistingZammadTicketSync(
     changes.push({ field: "ToDo", from: null, to: `${pendingTodo.title} (${pendingTodo.day})` });
   }
 
-  if (zammadTicket.workType === "support" && zammadTicket.zammadStateId === 4) {
+  const closedSupportNeedsTypeSync =
+    zammadTicket.workType === "support"
+    && zammadTicket.zammadStateId === 4
+    && fields.type
+    && !isProjectDataProtected
+    && (localTicket.work_type !== "support" || await ticketHasAnyProject(client, localTicket.id));
+  const metadataOnly = zammadTicket.workType === "support" && zammadTicket.zammadStateId === 4 && !closedSupportNeedsTypeSync;
+
+  if (!isMerge) {
+    const effectiveOrganizationId = !metadataOnly && fields.organization
+      ? zammadTicket.organizationId
+      : numberOrNull(localTicket.organization_id);
+    const effectiveWorkType = !metadataOnly && fields.type && !isProjectDataProtected
+      ? zammadTicket.workType
+      : localTicket.work_type ?? zammadTicket.workType;
+    const projectWillBeRemoved = !metadataOnly && fields.type && !isProjectDataProtected && zammadTicket.workType === "support";
+    changes.push(...await plannedTeamspaceAssignmentChanges(
+      client,
+      localTicket.id,
+      effectiveOrganizationId,
+      effectiveWorkType,
+      zammadTeamspaceProjectList(zammadTicket),
+      localTicket.user_id,
+      projectWillBeRemoved
+    ));
+  }
+
+  if (metadataOnly) {
     const resultChanges = zammadSyncResultChanges(changes);
 
     return resultChanges.length > 0
@@ -7924,7 +9446,9 @@ async function runTicketZammadMailSessionImport(
         requestedProjectTeamspaceEntryId: null,
         billingStatus: "billable",
         createZammadArticle: false,
+        zammadArticleDateHeader: false,
         zammadArticleTypeId: 6,
+        workSegments: [],
         startedAt,
         endedAt,
         durationSeconds: article.durationSeconds,
@@ -8645,7 +10169,13 @@ async function applyZammadTicketSync(
 
   localTicket = resolvedLocalTicket;
   const isMergeProtected = isMerge || isLocalMergedTicket(localTicket);
-  const metadataOnly = zammadTicket.workType === "support" && zammadTicket.zammadStateId === 4;
+  const closedSupportNeedsTypeSync =
+    zammadTicket.workType === "support"
+    && zammadTicket.zammadStateId === 4
+    && fields.type
+    && !isMergeProtected
+    && (localTicket.work_type !== "support" || await ticketHasAnyProject(client, localTicket.id));
+  const metadataOnly = zammadTicket.workType === "support" && zammadTicket.zammadStateId === 4 && !closedSupportNeedsTypeSync;
   const shouldResolveOrganization = !metadataOnly && (fields.organization || !localTicket.work_type);
   const organization = shouldResolveOrganization ? await getOrganizationByZammadId(client, zammadTicket.organizationId) : null;
   const ownerMapping = await zammadOwnerUserMapping(client, zammadTicket.zammadOwnerId);
@@ -8811,6 +10341,38 @@ async function applyZammadTicketSync(
   return "updated" as const;
 }
 
+async function applyZammadTicketSyncWithAssignment(
+  client: QueryClient,
+  localTicket: LocalZammadSyncTicket,
+  zammadTicket: ZammadTicketImport,
+  userId: string,
+  fields: ZammadSyncExistingFields
+) {
+  const status = await applyZammadTicketSync(client, localTicket, zammadTicket, userId, fields);
+
+  if (status === "organization-missing" || status === "not-owner") {
+    return status;
+  }
+
+  const targetResult = await client.query<{ id: string }>(
+    `
+      SELECT id::text AS id
+      FROM tickets
+      WHERE ticket_number = $1 OR zammad_ticket_id = $2
+      ORDER BY CASE WHEN ticket_number = $1 THEN 0 ELSE 1 END, id ASC
+      LIMIT 1;
+    `,
+    [zammadTicket.ticketNumber, zammadTicket.zammadTicketId]
+  );
+
+  if (targetResult.rows[0]) {
+    await autoAssignSingleProjectTeamspaceEntry(client, targetResult.rows[0].id);
+    await refreshSyncedTeamspaceAssignment(client, targetResult.rows[0].id, zammadTeamspaceProjectList(zammadTicket));
+  }
+
+  return status;
+}
+
 async function reopenPeriodsForSession(
   client: { query: (text: string, params?: unknown[]) => Promise<unknown> },
   ticketId: string,
@@ -8887,7 +10449,7 @@ async function getPeriodOverview(config: PeriodConfig, period: ParsedPeriod, use
               CASE
                 WHEN entry_time_comparison.ignored THEN 0
                 ELSE ptma.teamspace_billable_minutes
-                  - CASE WHEN entry_time_comparison.comparable THEN COALESCE(tt_entry.billed_minutes, 0) ELSE 0 END
+                  - COALESCE(tt_entry.billed_minutes, 0)
               END
             ), 0)::int AS teamspace_month_delta_minutes,
             COALESCE(jsonb_agg(
@@ -8903,7 +10465,7 @@ async function getPeriodOverview(config: PeriodConfig, period: ParsedPeriod, use
                   CASE
                     WHEN entry_time_comparison.ignored THEN 0
                     ELSE ptma.teamspace_billable_minutes
-                      - CASE WHEN entry_time_comparison.comparable THEN COALESCE(tt_entry.billed_minutes, 0) ELSE 0 END
+                      - COALESCE(tt_entry.billed_minutes, 0)
                   END
                 )::int,
                 'positions', ptma.positions
@@ -9102,6 +10664,7 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
       ? `ptma.month >= date_trunc('month', ${periodStartDateSql})::date
         AND ptma.month < (date_trunc('month', (${periodEndDateSql} - 1)) + interval '1 month')::date`
       : `ptma.month = date_trunc('month', ${periodStartDateSql})::date`;
+  const teamspaceActualMonthPredicateFor = (alias: string) => teamspaceActualMonthPredicate.replaceAll("ptma.", `${alias}.`);
   const projectTeamspaceEntryPeriodActualsCte =
     periodType === "week"
       ? `
@@ -9147,16 +10710,31 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
       : `
     project_teamspace_entry_period_actuals AS (
       SELECT
-        ptma.project_teamspace_entry_id,
-        COALESCE(SUM(ptma.teamspace_minutes), 0)::int AS teamspace_minutes,
-        COALESCE(SUM(ptma.teamspace_billable_minutes), 0)::int AS teamspace_billable_minutes,
-        COALESCE(SUM(ptma.teamspace_time_entry_count), 0)::int AS teamspace_time_entry_count,
-        COALESCE(jsonb_agg(position.value ORDER BY ptma.month ASC, position.ordinality ASC) FILTER (WHERE position.value IS NOT NULL), '[]'::jsonb) AS positions
-      FROM project_teamspace_monthly_actuals ptma
-      LEFT JOIN LATERAL jsonb_array_elements(COALESCE(ptma.positions, '[]'::jsonb)) WITH ORDINALITY AS position(value, ordinality) ON true
-      WHERE ptma.user_id = $3
-        AND ${teamspaceActualMonthPredicate}
-      GROUP BY ptma.project_teamspace_entry_id
+	        totals.project_teamspace_entry_id,
+	        totals.teamspace_minutes,
+	        totals.teamspace_billable_minutes,
+	        totals.teamspace_time_entry_count,
+	        COALESCE(positions.positions, '[]'::jsonb) AS positions
+	      FROM (
+	        SELECT
+	          ptma.project_teamspace_entry_id,
+	          COALESCE(SUM(ptma.teamspace_minutes), 0)::int AS teamspace_minutes,
+	          COALESCE(SUM(ptma.teamspace_billable_minutes), 0)::int AS teamspace_billable_minutes,
+	          COALESCE(SUM(ptma.teamspace_time_entry_count), 0)::int AS teamspace_time_entry_count
+	        FROM project_teamspace_monthly_actuals ptma
+	        WHERE ptma.user_id = $3
+	          AND ${teamspaceActualMonthPredicate}
+	        GROUP BY ptma.project_teamspace_entry_id
+	      ) totals
+	      LEFT JOIN LATERAL (
+	        SELECT
+	          COALESCE(jsonb_agg(position.value ORDER BY ptma_pos.month ASC, position.ordinality ASC) FILTER (WHERE position.value IS NOT NULL), '[]'::jsonb) AS positions
+	        FROM project_teamspace_monthly_actuals ptma_pos
+	        LEFT JOIN LATERAL jsonb_array_elements(COALESCE(ptma_pos.positions, '[]'::jsonb)) WITH ORDINALITY AS position(value, ordinality) ON true
+	        WHERE ptma_pos.user_id = $3
+	          AND ${teamspaceActualMonthPredicateFor("ptma_pos")}
+	          AND ptma_pos.project_teamspace_entry_id = totals.project_teamspace_entry_id
+	      ) positions ON true
     )`;
   const teamspaceApiBillableMinutesSql =
     periodType === "week"
@@ -9359,7 +10937,7 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
           CASE
             WHEN entry_time_comparison.ignored THEN 0
             ELSE ptma.teamspace_billable_minutes
-              - CASE WHEN entry_time_comparison.comparable THEN COALESCE(tt_entry.billed_minutes, 0) ELSE 0 END
+              - COALESCE(tt_entry.billed_minutes, 0)
           END
         ), 0)::int AS teamspace_month_delta_minutes,
         COALESCE(jsonb_agg(
@@ -9375,7 +10953,7 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
               CASE
                 WHEN entry_time_comparison.ignored THEN 0
                 ELSE ptma.teamspace_billable_minutes
-                  - CASE WHEN entry_time_comparison.comparable THEN COALESCE(tt_entry.billed_minutes, 0) ELSE 0 END
+                  - COALESCE(tt_entry.billed_minutes, 0)
               END
             )::int,
             'positions', ptma.positions
@@ -9461,6 +11039,8 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
     acknowledgedMissingCrmResult,
     mismatchResult,
     teamspaceDayResult,
+    scopedTicketDayResult,
+    invalidTeamspaceBillingResult,
     teamspaceMonthMismatchResult,
     closureResult
   ] = await Promise.all([
@@ -9701,55 +11281,168 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
         ${baseCte},
         teamspace_actual_day AS (
           SELECT
-            p.ticket_id,
             (day.value->>'day') AS day,
+            position.value->>'apiProjectId' AS api_project_id,
+            position.value->>'projectId' AS project_id,
+            position.value->>'mainProjectId' AS main_project_id,
+            COALESCE(
+              lower(NULLIF(position.value->>'ticketNumber', '')),
+              substring(
+                lower(concat_ws(' ', position.value->>'label', position.value->>'projectId', position.value->>'description'))
+                FROM '(ticket#[0-9]{6})'
+              )
+            ) AS ticket_number_hint,
+            NULLIF(position.value->>'customerName', '') AS customer_name,
+            COALESCE(NULLIF(position.value->>'label', ''), concat('API ', position.value->>'apiProjectId')) AS project_teamspace_project,
             COALESCE(SUM((day.value->>'billableMinutes')::int), 0)::int AS crm_billed_minutes,
-            COALESCE(SUM((day.value->>'entryCount')::int), 0)::int AS teamspace_entry_count,
-            NULLIF(
-              string_agg(
-                DISTINCT NULLIF(COALESCE(position.value->>'label', pte.teamspace_description, pte.teamspace_project), ''),
-                ' + '
-                ORDER BY NULLIF(COALESCE(position.value->>'label', pte.teamspace_description, pte.teamspace_project), '')
-              ),
-              ''
-            ) AS project_teamspace_project
-          FROM projects p
-          JOIN project_teamspace_entries pte ON pte.project_id = p.id
-          JOIN project_teamspace_entry_period_actuals ptma ON ptma.project_teamspace_entry_id = pte.id
-          LEFT JOIN teamspace_project_exclusions tpe ON lower(btrim(tpe.teamspace_project)) = lower(btrim(pte.teamspace_project))
-          JOIN LATERAL jsonb_array_elements(COALESCE(ptma.positions, '[]'::jsonb)) AS position(value) ON true
+            COALESCE(SUM((day.value->>'entryCount')::int), 0)::int AS teamspace_entry_count
+          FROM teamspace_monthly_user_actuals tmua
+          JOIN LATERAL jsonb_array_elements(COALESCE(tmua.positions, '[]'::jsonb)) AS position(value) ON true
           JOIN LATERAL jsonb_array_elements(COALESCE(position.value->'days', '[]'::jsonb)) AS day(value)
             ON (day.value->>'day') >= ${periodStartDateSql}::text
            AND (day.value->>'day') < ${periodEndDateSql}::text
-          WHERE tpe.teamspace_project IS NULL
-            AND (
-              p.user_id = $3
-              OR EXISTS (
-                SELECT 1
-                FROM sessions viewer_sessions
-                WHERE viewer_sessions.ticket_id = p.ticket_id
-                  AND viewer_sessions.user_id = $3
-                  AND viewer_sessions.started_at >= $1::timestamptz
-                  AND viewer_sessions.started_at < $2::timestamptz
+          WHERE tmua.user_id = $3
+	              AND ${teamspaceActualMonthPredicateFor("tmua")}
+          GROUP BY
+            day.value->>'day',
+            position.value->>'apiProjectId',
+            position.value->>'projectId',
+            position.value->>'mainProjectId',
+            COALESCE(
+              lower(NULLIF(position.value->>'ticketNumber', '')),
+              substring(
+                lower(concat_ws(' ', position.value->>'label', position.value->>'projectId', position.value->>'description'))
+                FROM '(ticket#[0-9]{6})'
               )
-            )
-          GROUP BY p.ticket_id, day.value->>'day'
+            ),
+            NULLIF(position.value->>'customerName', ''),
+            COALESCE(NULLIF(position.value->>'label', ''), concat('API ', position.value->>'apiProjectId'))
         )
         SELECT
-          tad.ticket_id::text AS ticket_id,
-          t.ticket_number,
-          COALESCE(day_sessions.organization_name, o.name, t.customer_name, 'Keine Organisation') AS organization_name,
+          mapped_ticket.ticket_id::text AS ticket_id,
+          mapped_ticket.ticket_number,
+          COALESCE(day_sessions.organization_name, mapped_ticket.organization_name, tad.customer_name, 'Nicht zugeordnet') AS organization_name,
           tad.day::text AS day,
           COALESCE(td.tracked_minutes, 0)::int AS tracked_minutes,
           tad.crm_billed_minutes,
           tad.teamspace_entry_count,
           (tad.crm_billed_minutes - COALESCE(td.tracked_minutes, 0))::int AS delta_minutes,
           COALESCE(day_sessions.session_count, 0)::int AS session_count,
-          COALESCE(day_sessions.project_teamspace_project, tad.project_teamspace_project) AS project_teamspace_project
+          COALESCE(day_sessions.project_teamspace_project, mapped_ticket.project_teamspace_project, tad.project_teamspace_project) AS project_teamspace_project,
+          tad.api_project_id,
+          tad.project_id AS teamspace_project_id,
+          COALESCE(mapped_ticket.teamspace_excluded, false) AS teamspace_excluded,
+          COALESCE(mapped_ticket.has_recurring_teamspace_project, false) AS has_recurring_teamspace_project,
+          mapped_ticket.work_type
         FROM teamspace_actual_day tad
-        JOIN tickets t ON t.id = tad.ticket_id
-        LEFT JOIN organizations o ON o.zammad_id = t.organization_id
-        LEFT JOIN ticket_day td ON td.ticket_id = tad.ticket_id AND td.day::text = tad.day
+        LEFT JOIN LATERAL (
+          SELECT
+            t.id AS ticket_id,
+            t.ticket_number,
+            t.work_type,
+            EXISTS (
+              SELECT 1
+              FROM recurring_billings rb
+              WHERE rb.user_id = $3
+                AND COALESCE(rb.ticket_number, 'Fix#' || rb.id) = t.ticket_number
+                AND rb.teamspace_project IS NOT NULL
+                AND btrim(rb.teamspace_project) <> ''
+            ) AS has_recurring_teamspace_project,
+            COALESCE(o.name, t.customer_name, 'Keine Organisation') AS organization_name,
+            COALESCE(NULLIF(pte.teamspace_description, ''), pte.teamspace_project, tad.project_teamspace_project) AS project_teamspace_project
+          FROM tickets t
+          LEFT JOIN projects p ON p.ticket_id = t.id
+          LEFT JOIN project_teamspace_entries pte ON pte.project_id = p.id
+          LEFT JOIN organizations o ON o.zammad_id = t.organization_id
+          WHERE (
+              (tad.ticket_number_hint IS NOT NULL AND lower(t.ticket_number) = tad.ticket_number_hint)
+              OR (
+                tad.ticket_number_hint IS NULL
+                AND (
+                  pte.teamspace_api_project_id::text = tad.api_project_id
+                  OR lower(btrim(pte.teamspace_project)) = lower(btrim(tad.project_id))
+                  OR lower(btrim(pte.teamspace_project)) = lower(btrim(tad.main_project_id))
+                  OR EXISTS (
+                    SELECT 1
+                    FROM recurring_billings rb
+                    LEFT JOIN teamspace_project_resources resource
+                      ON lower(btrim(resource.teamspace_project)) = lower(btrim(rb.teamspace_project))
+                    WHERE rb.user_id = $3
+                      AND COALESCE(rb.ticket_number, 'Fix#' || rb.id) = t.ticket_number
+                      AND rb.teamspace_project IS NOT NULL
+                      AND btrim(rb.teamspace_project) <> ''
+                      AND (
+                        lower(btrim(rb.teamspace_project)) = lower(btrim(tad.project_id))
+                        OR lower(btrim(rb.teamspace_project)) = lower(btrim(tad.main_project_id))
+                        OR lower(btrim(rb.teamspace_project)) = lower(btrim(tad.api_project_id))
+                        OR resource.teamspace_api_project_id::text = tad.api_project_id
+                      )
+                  )
+                )
+              )
+            )
+            AND (
+              tad.ticket_number_hint IS NOT NULL
+              OR p.user_id = $3
+              OR EXISTS (
+                SELECT 1
+                FROM sessions viewer_sessions
+                WHERE viewer_sessions.ticket_id = t.id
+                  AND viewer_sessions.user_id = $3
+                  AND viewer_sessions.started_at >= $1::timestamptz
+                  AND viewer_sessions.started_at < $2::timestamptz
+              )
+            )
+          ORDER BY
+            (tad.ticket_number_hint IS NOT NULL AND lower(t.ticket_number) = tad.ticket_number_hint) DESC,
+            EXISTS (
+              SELECT 1
+              FROM recurring_billings rb
+              WHERE rb.user_id = $3
+                AND COALESCE(rb.ticket_number, 'Fix#' || rb.id) = t.ticket_number
+                AND rb.teamspace_project IS NOT NULL
+                AND btrim(rb.teamspace_project) <> ''
+            ) DESC,
+            (p.user_id = $3) DESC,
+            pte.id DESC NULLS LAST
+          LIMIT 1
+        ) entry_ticket ON true
+        LEFT JOIN LATERAL (
+          SELECT
+            tpe.teamspace_project,
+            tpe.teamspace_name,
+            tpe.customer_name
+          FROM teamspace_project_exclusions tpe
+          WHERE (
+              tad.api_project_id ~ '^[0-9]+$'
+              AND (
+                tad.api_project_id::bigint = tpe.teamspace_api_project_id
+                OR tad.api_project_id::bigint = ANY(tpe.teamspace_api_project_ids)
+              )
+            )
+            OR (
+              tad.project_id IS NOT NULL
+              AND btrim(tad.project_id) <> ''
+              AND lower(btrim(tpe.teamspace_project)) = lower(btrim(tad.project_id))
+            )
+            OR (
+              tad.main_project_id IS NOT NULL
+              AND btrim(tad.main_project_id) <> ''
+              AND lower(btrim(tpe.teamspace_project)) = lower(btrim(tad.main_project_id))
+            )
+          LIMIT 1
+        ) excluded_project ON true
+        LEFT JOIN LATERAL (
+          SELECT
+            entry_ticket.ticket_id,
+            entry_ticket.ticket_number,
+            entry_ticket.work_type,
+            entry_ticket.has_recurring_teamspace_project,
+            COALESCE(entry_ticket.organization_name, excluded_project.customer_name) AS organization_name,
+            COALESCE(entry_ticket.project_teamspace_project, excluded_project.teamspace_name, excluded_project.teamspace_project) AS project_teamspace_project,
+            (excluded_project.teamspace_project IS NOT NULL) AS teamspace_excluded
+        ) mapped_ticket ON true
+        LEFT JOIN ticket_day td ON td.ticket_id = mapped_ticket.ticket_id AND td.day::text = tad.day
         LEFT JOIN LATERAL (
           SELECT
             MIN(sb.organization_name) AS organization_name,
@@ -9760,11 +11453,207 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
               ''
             ) AS project_teamspace_project
           FROM session_base sb
-          WHERE sb.ticket_id = tad.ticket_id
+          WHERE sb.ticket_id = mapped_ticket.ticket_id
             AND sb.day::text = tad.day
         ) day_sessions ON true
         WHERE tad.crm_billed_minutes > 0
-        ORDER BY tad.day ASC, t.ticket_number ASC;
+        ORDER BY tad.day ASC, mapped_ticket.ticket_number ASC NULLS LAST, tad.api_project_id ASC;
+      `,
+      [period.startIso, period.endIso, userId]
+    ),
+    query(
+      `
+        WITH scoped_ticket_days AS (
+          SELECT
+            t.id AS ticket_id,
+            t.ticket_number,
+            COALESCE(o.name, t.customer_name, 'Keine Organisation') AS organization_name,
+            (s.started_at AT TIME ZONE 'Europe/Berlin')::date AS day,
+            COUNT(*)::int AS session_count,
+            NULLIF(
+              string_agg(DISTINCT COALESCE(NULLIF(pte.teamspace_description, ''), pte.teamspace_project), ' + '),
+              ''
+            ) AS project_teamspace_project,
+            EXISTS (
+              SELECT 1
+              FROM project_teamspace_entries comparison_entry
+              JOIN projects comparison_project ON comparison_project.id = comparison_entry.project_id
+              JOIN teamspace_project_exclusions comparison_exclusion ON (
+                lower(btrim(comparison_exclusion.teamspace_project)) = lower(btrim(comparison_entry.teamspace_project))
+                OR comparison_entry.teamspace_api_project_id = comparison_exclusion.teamspace_api_project_id
+                OR comparison_entry.teamspace_api_project_id = ANY(comparison_exclusion.teamspace_api_project_ids)
+              )
+              WHERE comparison_project.ticket_id = t.id
+                AND comparison_project.user_id = $3
+            ) AS teamspace_excluded,
+            EXISTS (
+              SELECT 1
+              FROM recurring_billings rb
+              WHERE rb.user_id = $3
+                AND COALESCE(rb.ticket_number, 'Fix#' || rb.id) = t.ticket_number
+                AND rb.teamspace_project IS NOT NULL
+                AND btrim(rb.teamspace_project) <> ''
+            ) AS has_recurring_teamspace_project,
+            t.work_type
+          FROM sessions s
+          JOIN tickets t ON t.id = s.ticket_id
+          LEFT JOIN organizations o ON o.zammad_id = t.organization_id
+          LEFT JOIN project_teamspace_entries pte ON pte.id = s.project_teamspace_entry_id
+          WHERE s.user_id = $3
+            AND s.started_at >= $1::timestamptz
+            AND s.started_at < $2::timestamptz
+            AND s.billing_status = 'billed'
+            AND (
+              t.work_type = 'support'
+              OR (
+                t.work_type = 'consulting'
+                AND EXISTS (
+                  SELECT 1
+                  FROM teamspace_project_exclusions ticket_exclusion
+                  WHERE lower(btrim(ticket_exclusion.teamspace_project)) = lower(btrim(pte.teamspace_project))
+                    OR pte.teamspace_api_project_id = ticket_exclusion.teamspace_api_project_id
+                    OR pte.teamspace_api_project_id = ANY(ticket_exclusion.teamspace_api_project_ids)
+                )
+              )
+              OR EXISTS (
+                SELECT 1
+                FROM recurring_billings rb
+                WHERE rb.user_id = $3
+                  AND COALESCE(rb.ticket_number, 'Fix#' || rb.id) = t.ticket_number
+                  AND rb.teamspace_project IS NOT NULL
+                  AND btrim(rb.teamspace_project) <> ''
+              )
+            )
+          GROUP BY
+            t.id,
+            t.ticket_number,
+            COALESCE(o.name, t.customer_name, 'Keine Organisation'),
+            (s.started_at AT TIME ZONE 'Europe/Berlin')::date,
+            t.work_type
+        )
+        SELECT
+          scoped.ticket_id::text AS ticket_id,
+          scoped.ticket_number,
+          scoped.organization_name,
+          scoped.day::text AS day,
+          COALESCE(local_teamspace.billed_minutes, 0)::int AS tracked_minutes,
+          scoped.session_count,
+          scoped.project_teamspace_project,
+          scoped.teamspace_excluded,
+          scoped.has_recurring_teamspace_project,
+          scoped.work_type
+        FROM scoped_ticket_days scoped
+        LEFT JOIN LATERAL (
+          SELECT COALESCE(SUM(tdb.billed_minutes), 0)::int AS billed_minutes
+          FROM ticket_day_billings tdb
+          WHERE tdb.ticket_id = scoped.ticket_id
+            AND tdb.user_id = $3
+            AND tdb.day = scoped.day
+            AND (
+              scoped.work_type = 'support'
+              OR EXISTS (
+                SELECT 1
+                FROM projects billing_project
+                JOIN project_teamspace_entries billing_pte ON billing_pte.project_id = billing_project.id
+                JOIN teamspace_project_exclusions billing_exclusion ON true
+                WHERE billing_project.ticket_id = scoped.ticket_id
+                  AND billing_project.user_id = $3
+                  AND (
+                    billing_pte.id = tdb.project_teamspace_entry_id
+                    OR (tdb.project_teamspace_entry_id IS NULL AND billing_pte.is_default)
+                  )
+                  AND (
+                    lower(btrim(billing_exclusion.teamspace_project)) = lower(btrim(billing_pte.teamspace_project))
+                    OR billing_pte.teamspace_api_project_id = billing_exclusion.teamspace_api_project_id
+                    OR billing_pte.teamspace_api_project_id = ANY(billing_exclusion.teamspace_api_project_ids)
+                  )
+              )
+            )
+        ) local_teamspace ON true
+        ORDER BY scoped.day ASC, scoped.ticket_number ASC;
+      `,
+      [period.startIso, period.endIso, userId]
+    ),
+    query(
+      `
+        WITH local_teamspace_values AS (
+          SELECT
+            tdb.ticket_id,
+            tdb.day,
+            COALESCE(SUM(tdb.billed_minutes), 0)::int AS tracked_minutes,
+            NULLIF(
+              string_agg(
+                DISTINCT COALESCE(
+                  NULLIF(direct_entry.teamspace_description, ''),
+                  direct_entry.teamspace_project,
+                  NULLIF(default_entry.teamspace_description, ''),
+                  default_entry.teamspace_project
+                ),
+                ' + '
+              ),
+              ''
+            ) AS project_teamspace_project
+          FROM ticket_day_billings tdb
+          LEFT JOIN project_teamspace_entries direct_entry ON direct_entry.id = tdb.project_teamspace_entry_id
+          LEFT JOIN LATERAL (
+            SELECT pte.teamspace_description, pte.teamspace_project
+            FROM projects p
+            JOIN project_teamspace_entries pte ON pte.project_id = p.id
+            WHERE p.ticket_id = tdb.ticket_id
+              AND p.user_id = $3
+              AND pte.is_default
+            ORDER BY pte.id ASC
+            LIMIT 1
+          ) default_entry ON tdb.project_teamspace_entry_id IS NULL
+          WHERE tdb.user_id = $3
+            AND tdb.day >= ($1::timestamptz AT TIME ZONE 'Europe/Berlin')::date
+            AND tdb.day < ($2::timestamptz AT TIME ZONE 'Europe/Berlin')::date
+          GROUP BY tdb.ticket_id, tdb.day
+          HAVING COALESCE(SUM(tdb.billed_minutes), 0) > 0
+        )
+        SELECT
+          local_value.ticket_id::text AS ticket_id,
+          t.ticket_number,
+          COALESCE(o.name, t.customer_name, 'Keine Organisation') AS organization_name,
+          local_value.day::text AS day,
+          local_value.tracked_minutes,
+          COALESCE(day_sessions.session_count, 0)::int AS session_count,
+          COALESCE(day_sessions.billed_session_count, 0)::int AS billed_session_count,
+          COALESCE(day_sessions.billable_session_count, 0)::int AS billable_session_count,
+          COALESCE(day_sessions.non_billable_session_count, 0)::int AS non_billable_session_count,
+          COALESCE(day_sessions.unrated_session_count, 0)::int AS unrated_session_count,
+          local_value.project_teamspace_project,
+          EXISTS (
+            SELECT 1
+            FROM projects project
+            JOIN project_teamspace_entries project_entry ON project_entry.project_id = project.id
+            JOIN teamspace_project_exclusions project_exclusion ON (
+              lower(btrim(project_exclusion.teamspace_project)) = lower(btrim(project_entry.teamspace_project))
+              OR project_entry.teamspace_api_project_id = project_exclusion.teamspace_api_project_id
+              OR project_entry.teamspace_api_project_id = ANY(project_exclusion.teamspace_api_project_ids)
+            )
+            WHERE project.ticket_id = local_value.ticket_id
+              AND project.user_id = $3
+          ) AS teamspace_excluded,
+          t.work_type,
+          true AS tt_value_without_billed_session
+        FROM local_teamspace_values local_value
+        JOIN tickets t ON t.id = local_value.ticket_id
+        LEFT JOIN organizations o ON o.zammad_id = t.organization_id
+        LEFT JOIN LATERAL (
+          SELECT
+            COUNT(*)::int AS session_count,
+            COUNT(*) FILTER (WHERE s.billing_status = 'billed')::int AS billed_session_count,
+            COUNT(*) FILTER (WHERE s.billing_status = 'billable')::int AS billable_session_count,
+            COUNT(*) FILTER (WHERE s.billing_status = 'non_billable')::int AS non_billable_session_count,
+            COUNT(*) FILTER (WHERE s.billing_status IS NULL)::int AS unrated_session_count
+          FROM sessions s
+          WHERE s.ticket_id = local_value.ticket_id
+            AND s.user_id = $3
+            AND (s.started_at AT TIME ZONE 'Europe/Berlin')::date = local_value.day
+        ) day_sessions ON true
+        WHERE COALESCE(day_sessions.billed_session_count, 0) = 0
+        ORDER BY local_value.day ASC, t.ticket_number ASC;
       `,
       [period.startIso, period.endIso, userId]
     ),
@@ -9825,8 +11714,80 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
     crm_billed_minutes: 0,
     teamspace_api_billable_minutes: 0
   };
+  const ticketTeamspaceDays = new Map<string, any>();
+
+  for (const row of scopedTicketDayResult.rows) {
+    ticketTeamspaceDays.set(`${row.ticket_id}:${row.day}`, {
+      ...row,
+      crm_billed_minutes: 0,
+      teamspace_entry_count: 0,
+      delta_minutes: -Number(row.tracked_minutes ?? 0),
+      api_project_id: null,
+      teamspace_project_id: null,
+      tt_value_without_billed_session: false
+    });
+  }
+
+  for (const row of invalidTeamspaceBillingResult.rows) {
+    ticketTeamspaceDays.set(`${row.ticket_id}:${row.day}`, {
+      ...row,
+      crm_billed_minutes: 0,
+      teamspace_entry_count: 0,
+      delta_minutes: -Number(row.tracked_minutes ?? 0),
+      api_project_id: null,
+      teamspace_project_id: null,
+      tt_value_without_billed_session: true
+    });
+  }
+
+  for (const row of teamspaceDayResult.rows) {
+    if (!row.ticket_id) {
+      continue;
+    }
+
+    const key = `${row.ticket_id}:${row.day}`;
+    const existing = ticketTeamspaceDays.get(key);
+    const ticketComparisonEnabled = row.work_type === "support"
+      || (row.work_type === "consulting" && row.teamspace_excluded)
+      || row.has_recurring_teamspace_project;
+
+    if (!ticketComparisonEnabled && !existing?.tt_value_without_billed_session) {
+      continue;
+    }
+
+    const teamspaceMinutes = Number(row.crm_billed_minutes ?? 0);
+
+    if (existing) {
+      existing.crm_billed_minutes = Number(existing.crm_billed_minutes ?? 0) + teamspaceMinutes;
+      existing.teamspace_entry_count = Number(existing.teamspace_entry_count ?? 0) + Number(row.teamspace_entry_count ?? 0);
+      existing.api_project_id ??= row.api_project_id ?? null;
+      existing.teamspace_project_id ??= row.teamspace_project_id ?? null;
+      existing.project_teamspace_project ??= row.project_teamspace_project ?? null;
+      existing.teamspace_excluded = Boolean(existing.teamspace_excluded || row.teamspace_excluded);
+      existing.delta_minutes = existing.crm_billed_minutes - Number(existing.tracked_minutes ?? 0);
+      continue;
+    }
+
+    ticketTeamspaceDays.set(key, {
+      ...row,
+      tracked_minutes: 0,
+      session_count: 0,
+      delta_minutes: teamspaceMinutes,
+      tt_value_without_billed_session: false
+    });
+  }
+
+  const ticketTeamspaceMismatches = Array.from(ticketTeamspaceDays.values())
+    .filter((row) => Number(row.delta_minutes ?? 0) !== 0 || row.tt_value_without_billed_session)
+    .sort((left, right) => left.day.localeCompare(right.day)
+      || left.ticket_number.localeCompare(right.ticket_number, "de", { numeric: true, sensitivity: "base" }));
   const effectiveCrmBilledMinutes = teamspaceTimeTrackingEnabled ? totals.crm_billed_minutes : totals.minutes;
   const teamspaceApiBillableMinutes = Number(totals.teamspace_api_billable_minutes ?? 0);
+  const teamspaceApiDeltaMinutes = teamspaceApiBillableMinutes - effectiveCrmBilledMinutes;
+  const blockingTeamspaceMonthMismatches =
+    teamspaceTimeTrackingEnabled && teamspaceApiDeltaMinutes !== 0
+      ? teamspaceMonthMismatchResult.rows
+      : [];
   const applyTeamspaceDelta = (row: any) => teamspaceTimeTrackingEnabled
     ? { ...row, crm_delta_minutes: row.crm_billed_minutes - row.total_minutes }
     : { ...row, crm_billed_minutes: row.total_minutes, crm_delta_minutes: 0 };
@@ -9860,7 +11821,7 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
       crmBilledMinutes: effectiveCrmBilledMinutes,
       crmDeltaMinutes: teamspaceTimeTrackingEnabled ? effectiveCrmBilledMinutes - totals.minutes : 0,
       teamspaceApiBillableMinutes,
-      teamspaceApiDeltaMinutes: teamspaceApiBillableMinutes - effectiveCrmBilledMinutes
+      teamspaceApiDeltaMinutes
     },
     dailySeries: dailyResult.rows.map(applyTeamspaceDaily),
     organizations: organizationResult.rows.map(applyTeamspaceDelta),
@@ -9871,7 +11832,8 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string, perio
       missingCrmDays: missingCrmResult.rows,
       acknowledgedMissingCrmDays: acknowledgedMissingCrmResult.rows,
       crmMismatches: mismatchResult.rows,
-      teamspaceMonthMismatches: teamspaceMonthMismatchResult.rows
+      teamspaceMonthMismatches: blockingTeamspaceMonthMismatches,
+      ticketTeamspaceMismatches: teamspaceTimeTrackingEnabled ? ticketTeamspaceMismatches : []
     },
     teamspaceDays: teamspaceTimeTrackingEnabled ? teamspaceDayResult.rows : []
   };
@@ -10277,6 +12239,209 @@ async function restartProjectFollowupPeriodForTicket(client: QueryClient, ticket
   );
 }
 
+async function getTicketTeamspaceDays(ticketId: number, userId: string, period: ParsedPeriod) {
+  return query(
+    `
+      WITH target_ticket AS (
+        SELECT
+          t.id,
+          t.ticket_number,
+          t.work_type,
+          EXISTS (
+            SELECT 1
+            FROM projects p
+            JOIN project_teamspace_entries pte ON pte.project_id = p.id
+            JOIN teamspace_project_exclusions tpe ON (
+              lower(btrim(tpe.teamspace_project)) = lower(btrim(pte.teamspace_project))
+              OR pte.teamspace_api_project_id = tpe.teamspace_api_project_id
+              OR pte.teamspace_api_project_id = ANY(tpe.teamspace_api_project_ids)
+            )
+            WHERE p.ticket_id = t.id
+              AND p.user_id = $2
+          ) AS teamspace_excluded,
+          EXISTS (
+            SELECT 1
+            FROM recurring_billings rb
+            WHERE rb.user_id = $2
+              AND COALESCE(rb.ticket_number, 'Fix#' || rb.id) = t.ticket_number
+              AND rb.teamspace_project IS NOT NULL
+              AND btrim(rb.teamspace_project) <> ''
+          ) AS has_recurring_teamspace_project,
+          (
+            SELECT btrim(rb.teamspace_project)
+            FROM recurring_billings rb
+            WHERE rb.user_id = $2
+              AND COALESCE(rb.ticket_number, 'Fix#' || rb.id) = t.ticket_number
+              AND rb.teamspace_project IS NOT NULL
+              AND btrim(rb.teamspace_project) <> ''
+            ORDER BY rb.id ASC
+            LIMIT 1
+          ) AS recurring_teamspace_project
+        FROM tickets t
+        WHERE t.id = $1
+      ),
+      ticket_scope AS (
+        SELECT
+          target_ticket.*,
+          (
+            work_type = 'support'
+            OR (work_type = 'consulting' AND teamspace_excluded)
+            OR has_recurring_teamspace_project
+          ) AS comparison_enabled
+        FROM target_ticket
+      ),
+      session_days AS (
+        SELECT
+          (s.started_at AT TIME ZONE 'Europe/Berlin')::date AS day,
+          COUNT(*)::int AS session_count,
+          COUNT(*) FILTER (WHERE s.billing_status = 'billed')::int AS billed_session_count,
+          COUNT(*) FILTER (WHERE s.billing_status = 'billable')::int AS billable_session_count,
+          COUNT(*) FILTER (WHERE s.billing_status = 'non_billable')::int AS non_billable_session_count,
+          COUNT(*) FILTER (WHERE s.billing_status IS NULL)::int AS unrated_session_count
+        FROM sessions s
+        WHERE s.ticket_id = $1
+          AND s.user_id = $2
+          AND s.started_at >= $3::timestamptz
+          AND s.started_at < $4::timestamptz
+        GROUP BY (s.started_at AT TIME ZONE 'Europe/Berlin')::date
+      ),
+      local_days AS (
+        SELECT
+          tdb.day,
+          COALESCE(SUM(tdb.billed_minutes), 0)::int AS tracked_minutes,
+          COUNT(*) > 0 AS has_tt_value
+        FROM ticket_day_billings tdb
+        WHERE tdb.ticket_id = $1
+          AND tdb.user_id = $2
+          AND tdb.day >= ($3::timestamptz AT TIME ZONE 'Europe/Berlin')::date
+          AND tdb.day < ($4::timestamptz AT TIME ZONE 'Europe/Berlin')::date
+        GROUP BY tdb.day
+      ),
+      api_rows AS (
+        SELECT
+          (day.value->>'day')::date AS day,
+          COALESCE((day.value->>'billableMinutes')::int, 0) AS billable_minutes,
+          COALESCE((day.value->>'entryCount')::int, 0) AS entry_count,
+          position.value->>'apiProjectId' AS api_project_id,
+          position.value->>'projectId' AS project_id,
+          position.value->>'mainProjectId' AS main_project_id,
+          COALESCE(
+            lower(NULLIF(position.value->>'ticketNumber', '')),
+            substring(
+              lower(concat_ws(' ', position.value->>'label', position.value->>'projectId', position.value->>'description'))
+              FROM '(ticket#[0-9]{6})'
+            )
+          ) AS ticket_number_hint
+        FROM teamspace_monthly_user_actuals tmua
+        JOIN LATERAL jsonb_array_elements(COALESCE(tmua.positions, '[]'::jsonb)) AS position(value) ON true
+        JOIN LATERAL jsonb_array_elements(COALESCE(position.value->'days', '[]'::jsonb)) AS day(value)
+          ON (day.value->>'day') >= (($3::timestamptz AT TIME ZONE 'Europe/Berlin')::date)::text
+         AND (day.value->>'day') < (($4::timestamptz AT TIME ZONE 'Europe/Berlin')::date)::text
+        WHERE tmua.user_id = $2
+          AND tmua.month >= date_trunc('month', ($3::timestamptz AT TIME ZONE 'Europe/Berlin')::date)::date
+          AND tmua.month < (date_trunc('month', (($4::timestamptz AT TIME ZONE 'Europe/Berlin')::date - 1)) + interval '1 month')::date
+      ),
+      api_days AS (
+        SELECT
+          api_rows.day,
+          COALESCE(SUM(api_rows.billable_minutes), 0)::int AS crm_billed_minutes,
+          COALESCE(SUM(api_rows.entry_count), 0)::int AS teamspace_entry_count
+        FROM api_rows
+        CROSS JOIN ticket_scope ts
+        WHERE api_rows.ticket_number_hint = lower(ts.ticket_number)
+          OR (
+            api_rows.ticket_number_hint IS NULL
+            AND EXISTS (
+              SELECT 1
+              FROM projects p
+              JOIN project_teamspace_entries pte ON pte.project_id = p.id
+              WHERE p.ticket_id = ts.id
+                AND p.user_id = $2
+                AND (
+                  pte.teamspace_api_project_id::text = api_rows.api_project_id
+                  OR lower(btrim(pte.teamspace_project)) = lower(btrim(api_rows.project_id))
+                  OR lower(btrim(pte.teamspace_project)) = lower(btrim(api_rows.main_project_id))
+                )
+            )
+            OR (
+              api_rows.ticket_number_hint IS NULL
+              AND
+              ts.recurring_teamspace_project IS NOT NULL
+              AND (
+                lower(btrim(ts.recurring_teamspace_project)) = lower(btrim(api_rows.project_id))
+                OR lower(btrim(ts.recurring_teamspace_project)) = lower(btrim(api_rows.main_project_id))
+                OR lower(btrim(ts.recurring_teamspace_project)) = lower(btrim(api_rows.api_project_id))
+                OR EXISTS (
+                  SELECT 1
+                  FROM teamspace_project_resources resource
+                  WHERE lower(btrim(resource.teamspace_project)) = lower(btrim(ts.recurring_teamspace_project))
+                    AND resource.teamspace_api_project_id::text = api_rows.api_project_id
+                )
+              )
+            )
+          )
+        GROUP BY api_rows.day
+      ),
+      all_days AS (
+        SELECT day FROM session_days
+        UNION
+        SELECT day FROM local_days
+        UNION
+        SELECT day FROM api_days
+      )
+      SELECT
+        all_days.day::text AS day,
+        COALESCE(local_days.tracked_minutes, 0)::int AS tracked_minutes,
+        COALESCE(api_days.crm_billed_minutes, 0)::int AS crm_billed_minutes,
+        COALESCE(api_days.teamspace_entry_count, 0)::int AS teamspace_entry_count,
+        (COALESCE(api_days.crm_billed_minutes, 0) - COALESCE(local_days.tracked_minutes, 0))::int AS delta_minutes,
+        COALESCE(session_days.session_count, 0)::int AS session_count,
+        COALESCE(session_days.billed_session_count, 0)::int AS billed_session_count,
+        COALESCE(session_days.billable_session_count, 0)::int AS billable_session_count,
+        COALESCE(session_days.non_billable_session_count, 0)::int AS non_billable_session_count,
+        COALESCE(session_days.unrated_session_count, 0)::int AS unrated_session_count,
+        COALESCE(local_days.has_tt_value, false) AS has_tt_value,
+        (
+          ticket_scope.comparison_enabled
+          AND COALESCE(session_days.billed_session_count, 0) > 0
+          AND NOT COALESCE(local_days.has_tt_value, false)
+        ) AS missing_tt_value,
+        (
+          COALESCE(local_days.tracked_minutes, 0) > 0
+          AND COALESCE(session_days.billed_session_count, 0) = 0
+        ) AS tt_value_without_billed_session,
+        acknowledgement.acknowledged_at IS NOT NULL AS acknowledged,
+        acknowledgement.acknowledged_at,
+        ticket_scope.comparison_enabled,
+        ticket_scope.teamspace_excluded,
+        ticket_scope.work_type
+      FROM all_days
+      CROSS JOIN ticket_scope
+      LEFT JOIN session_days ON session_days.day = all_days.day
+      LEFT JOIN local_days ON local_days.day = all_days.day
+      LEFT JOIN api_days ON api_days.day = all_days.day
+      LEFT JOIN ticket_day_billing_acknowledgements acknowledgement
+        ON acknowledgement.ticket_id = ticket_scope.id
+       AND acknowledgement.user_id = $2
+       AND acknowledgement.day = all_days.day
+      WHERE (
+          ticket_scope.comparison_enabled
+          AND (
+            COALESCE(session_days.billed_session_count, 0) > 0
+            OR COALESCE(local_days.tracked_minutes, 0) > 0
+            OR COALESCE(api_days.crm_billed_minutes, 0) > 0
+          )
+        )
+        OR (
+          COALESCE(local_days.tracked_minutes, 0) > 0
+          AND COALESCE(session_days.billed_session_count, 0) = 0
+        )
+      ORDER BY all_days.day ASC;
+    `,
+    [ticketId, userId, period.startIso, period.endIso]
+  );
+}
+
 async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticketId: number, userId: string) {
   await ensureRecurringSessionsForUserPeriod(userId, period.startIso, period.endIso);
 
@@ -10284,6 +12449,7 @@ async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticke
     return null;
   }
 
+  const canManageAtossSupport = await userCanManageTicket({ query }, ticketId, userId);
   await autoAssignSingleProjectTeamspaceEntry({ query }, String(ticketId), userId);
 
   const periodClosureJoin =
@@ -10300,6 +12466,11 @@ async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticke
         o.name AS organization_name,
         COALESCE(o.name, t.customer_name) AS customer_name,
         t.work_type,
+        t.atoss_support,
+        t.teamspace_assignment_rule_id::text AS teamspace_assignment_rule_id,
+        assignment_rule.name AS teamspace_assignment_rule_name,
+        t.teamspace_assignment_project,
+        t.teamspace_assignment_synced_at,
         t.zammad_priority_id::text AS zammad_priority_id,
         CASE WHEN t.zammad_state_id = 1 THEN '2' ELSE t.zammad_state_id::text END AS zammad_state_id,
         NULL::timestamptz AS closed_at,
@@ -10315,6 +12486,7 @@ async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticke
         ) AS has_recurring_billing
       FROM tickets t
       LEFT JOIN organizations o ON o.zammad_id = t.organization_id
+      LEFT JOIN teamspace_assignment_rules assignment_rule ON assignment_rule.id = t.teamspace_assignment_rule_id
       ${periodClosureJoin}
       LEFT JOIN LATERAL (
         SELECT
@@ -10361,6 +12533,7 @@ async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticke
         ended_at,
         duration_seconds,
         rounded_minutes,
+        work_segments,
         billing_status,
         billing_updated_at,
         created_at,
@@ -10427,6 +12600,7 @@ async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticke
     `,
     [ticketId, userId, period.start, period.endIso]
   );
+  const ticketTeamspaceDaysResult = await getTicketTeamspaceDays(ticketId, userId, period);
 
   const sessions = sessionsResult.rows;
   const openCount = sessions.filter((session: any) => session.billing_status === null || session.billing_status === "billable").length;
@@ -10440,6 +12614,7 @@ async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticke
     period: period.label,
     ticket: {
       ...ticket,
+      can_manage_atoss_support: canManageAtossSupport,
       requires_closure: false,
       recurring_session_count: recurringSessionCount,
       manual_session_count: manualSessionCount
@@ -10448,6 +12623,7 @@ async function getPeriodTicket(config: PeriodConfig, period: ParsedPeriod, ticke
     closedAt: config.type === "month" ? ticketResult.rows[0].period_closed_at ?? null : null,
     sessions,
     dayBillings: dayBillingResult.rows,
+    ticketTeamspaceDays: ticketTeamspaceDaysResult.rows,
     canClose: false,
     openCount,
     ticketOpenCount
@@ -10463,6 +12639,7 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
     return null;
   }
 
+  const canManageAtossSupport = await userCanManageTicket({ query }, ticketId, userId);
   await autoAssignSingleProjectTeamspaceEntry({ query }, String(ticketId), userId);
 
   const ticketResult = await query(
@@ -10475,6 +12652,11 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
         o.name AS organization_name,
         COALESCE(o.name, t.customer_name) AS customer_name,
         t.work_type,
+        t.atoss_support,
+        t.teamspace_assignment_rule_id::text AS teamspace_assignment_rule_id,
+        assignment_rule.name AS teamspace_assignment_rule_name,
+        t.teamspace_assignment_project,
+        t.teamspace_assignment_synced_at,
         t.zammad_ticket_id::text AS zammad_ticket_id,
         t.zammad_group_id::text AS zammad_group_id,
         t.zammad_priority_id::text AS zammad_priority_id,
@@ -10484,7 +12666,16 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
         zammad_owner_user.display_name AS zammad_owner_display_name,
         zammad_owner_user.username AS zammad_owner_username,
         (viewer.zammad_user_id IS NOT NULL AND t.zammad_owner_id IS NOT NULL AND viewer.zammad_user_id IS DISTINCT FROM t.zammad_owner_id) AS is_foreign_zammad_owner,
-        (t.zammad_ticket_id IS NULL AND (t.user_id = $2::bigint OR t.user_id IS NULL)) AS can_edit_ticket_data,
+        (
+          t.zammad_ticket_id IS NULL
+          AND (t.user_id = $2::bigint OR t.user_id IS NULL)
+          AND NOT EXISTS (
+            SELECT 1
+            FROM recurring_billings rb_edit
+            WHERE rb_edit.user_id = $2
+              AND COALESCE(rb_edit.ticket_number, 'Fix#' || rb_edit.id) = t.ticket_number
+          )
+        ) AS can_edit_ticket_data,
         NULL::timestamptz AS closed_at,
         NULL::timestamptz AS period_closed_at,
         COALESCE(all_sessions.session_count, 0)::int AS ticket_session_count,
@@ -10499,6 +12690,7 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
       FROM tickets t
       JOIN users viewer ON viewer.id = $2
       LEFT JOIN organizations o ON o.zammad_id = t.organization_id
+      LEFT JOIN teamspace_assignment_rules assignment_rule ON assignment_rule.id = t.teamspace_assignment_rule_id
       LEFT JOIN users zammad_owner_user ON zammad_owner_user.role = 'user' AND zammad_owner_user.active AND zammad_owner_user.zammad_user_id = t.zammad_owner_id
       LEFT JOIN LATERAL (
         SELECT
@@ -10567,6 +12759,7 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
           s.ended_at,
           s.duration_seconds,
           s.rounded_minutes,
+          s.work_segments,
           s.billing_status,
           s.billing_updated_at,
           s.created_at,
@@ -10655,6 +12848,11 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
                 AND viewer.active
                 AND viewer.zammad_user_id = t.zammad_owner_id
             )
+          ) AND NOT EXISTS (
+            SELECT 1
+            FROM recurring_billings rb_edit
+            WHERE rb_edit.user_id = $2
+              AND COALESCE(rb_edit.ticket_number, 'Fix#' || rb_edit.id) = t.ticket_number
           ), false) AS can_edit,
           p.ticket_id::text AS ticket_id,
           t.ticket_number,
@@ -10915,7 +13113,7 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
           CASE
             WHEN entry_time_comparison.ignored THEN 0
             ELSE ptma.teamspace_billable_minutes
-              - CASE WHEN entry_time_comparison.comparable THEN COALESCE(tt_entry.billed_minutes, 0) ELSE 0 END
+              - COALESCE(tt_entry.billed_minutes, 0)
           END
         )::int AS delta_minutes,
         ptma.positions
@@ -10990,6 +13188,9 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
     `,
     [ticketId, userId, filters.month.start, filters.month.endIso]
   ) : { rows: [] as any[] };
+  const ticketTeamspaceDaysResult = filters.month
+    ? await getTicketTeamspaceDays(ticketId, userId, filters.month)
+    : { rows: [] as any[] };
 
   return {
     periodType: "all",
@@ -11004,12 +13205,14 @@ async function getTicketDetails(ticketId: number, userId: string, filters: { mon
     availableMonths: monthsResult.rows,
     ticket: {
       ...ticket,
+      can_manage_atoss_support: canManageAtossSupport,
       requires_closure: false,
       recurring_session_count: recurringSessionCount,
       manual_session_count: manualSessionCount
     },
     sessions,
     dayBillings: dayBillingResult.rows,
+    ticketTeamspaceDays: ticketTeamspaceDaysResult.rows,
     teamspaceMonthActuals: teamspaceMonthActualsResult.rows,
     teamspaceMonthBillableMinutes: teamspaceMonthActualsResult.rows.reduce((sum: number, actual: any) => sum + Number(actual.teamspace_billable_minutes ?? 0), 0),
     teamspaceMonthDeltaMinutes: teamspaceMonthActualsResult.rows.reduce((sum: number, actual: any) => sum + Number(actual.delta_minutes ?? 0), 0),
@@ -11064,8 +13267,10 @@ app.post("/api/setup/admin", async (req, res) => {
       has_teamspace_credentials: boolean;
       zammad_email_session_webhook_enabled: boolean;
       session_billing_prompt_enabled: boolean;
+      session_work_segments_enabled: boolean;
       teamspace_time_tracking_enabled: boolean;
       zammad_session_note_default_enabled: boolean;
+      zammad_session_note_date_header_enabled: boolean;
       zammad_time_unit_rounding_enabled: boolean;
       zammad_time_unit_rounding_minutes: number;
       zammad_atoss_email_sync_enabled: boolean;
@@ -11079,7 +13284,7 @@ app.post("/api/setup/admin", async (req, res) => {
       `
         INSERT INTO users (username, display_name, password_hash, role, active)
         VALUES ($1, $2, $3, 'admin', true)
-        RETURNING id, username, display_name, role, active, zammad_user_id::text AS zammad_user_id, (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials, zammad_email_session_webhook_enabled, session_billing_prompt_enabled, teamspace_time_tracking_enabled, zammad_session_note_default_enabled, zammad_time_unit_rounding_enabled, zammad_time_unit_rounding_minutes, zammad_atoss_email_sync_enabled, COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id, project_followup_enabled, project_followup_weeks, project_followup_second_enabled, project_followup_second_weeks, project_followup_complete_on_session;
+        RETURNING id, username, display_name, role, active, zammad_user_id::text AS zammad_user_id, (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials, zammad_email_session_webhook_enabled, session_billing_prompt_enabled, session_work_segments_enabled, teamspace_time_tracking_enabled, zammad_session_note_default_enabled, zammad_session_note_date_header_enabled, zammad_time_unit_rounding_enabled, zammad_time_unit_rounding_minutes, zammad_atoss_email_sync_enabled, COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id, project_followup_enabled, project_followup_weeks, project_followup_second_enabled, project_followup_second_weeks, project_followup_complete_on_session;
       `,
       [username, displayName, await hashPassword(password)]
     );
@@ -11139,8 +13344,10 @@ app.post("/api/auth/login", async (req, res) => {
     has_teamspace_credentials: boolean;
     zammad_email_session_webhook_enabled: boolean;
     session_billing_prompt_enabled: boolean;
+    session_work_segments_enabled: boolean;
     teamspace_time_tracking_enabled: boolean;
     zammad_session_note_default_enabled: boolean;
+    zammad_session_note_date_header_enabled: boolean;
     zammad_time_unit_rounding_enabled: boolean;
     zammad_time_unit_rounding_minutes: number;
     zammad_atoss_email_sync_enabled: boolean;
@@ -11163,8 +13370,10 @@ app.post("/api/auth/login", async (req, res) => {
         (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials,
         zammad_email_session_webhook_enabled,
         session_billing_prompt_enabled,
+        session_work_segments_enabled,
         teamspace_time_tracking_enabled,
         zammad_session_note_default_enabled,
+        zammad_session_note_date_header_enabled,
         zammad_time_unit_rounding_enabled,
         zammad_time_unit_rounding_minutes,
         zammad_atoss_email_sync_enabled,
@@ -11223,8 +13432,10 @@ app.post("/api/auth/login", async (req, res) => {
       has_teamspace_credentials: user.has_teamspace_credentials,
       zammad_email_session_webhook_enabled: user.zammad_email_session_webhook_enabled,
       session_billing_prompt_enabled: user.session_billing_prompt_enabled,
+      session_work_segments_enabled: user.session_work_segments_enabled,
       teamspace_time_tracking_enabled: user.teamspace_time_tracking_enabled,
       zammad_session_note_default_enabled: user.zammad_session_note_default_enabled,
+      zammad_session_note_date_header_enabled: user.zammad_session_note_date_header_enabled,
       zammad_time_unit_rounding_enabled: user.zammad_time_unit_rounding_enabled,
       zammad_time_unit_rounding_minutes: user.zammad_time_unit_rounding_minutes,
       zammad_atoss_email_sync_enabled: user.zammad_atoss_email_sync_enabled,
@@ -11590,29 +13801,9 @@ app.post("/api/teamspace/project-ids/sync", requireUser, async (req, res) => {
     }
   });
 
-  let remoteSubprojectsScanned = 0;
-  let subentriesSynced = 0;
-  let subentriesRemoved = 0;
-
-  if (subentrySyncEntries.length > 0) {
-    const subprojects = await loadTeamspaceRemoteSubprojectsSingleCall(
-      credentials.baseUrl,
-      credentials.deviceId,
-      credentials.devicePassword,
-      subentrySyncEntries.map((entry) => Number(entry.teamspace_api_project_id)).filter((id) => Number.isInteger(id) && id > 0)
-    );
-    const syncResult = await withTransaction((client) => syncTeamspaceSubentriesForEntries(
-      client,
-      user.id,
-      subentrySyncEntries,
-      subprojects.projects,
-      credentials.baseUrl
-    ));
-    remoteSubprojectsScanned = subprojects.scanned;
-    subentriesSynced = syncResult.synced;
-    subentriesRemoved = syncResult.removed;
-    await withTransaction((client) => consolidateSharedTeamspaceProjectData(client, subentrySyncEntries.map((entry) => entry.teamspace_project)));
-  }
+  const remoteSubprojectsScanned = 0;
+  const subentriesSynced = 0;
+  const subentriesRemoved = 0;
 
   let teamspaceTimeEntriesScanned = 0;
   let teamspaceTimeEntriesMapped = 0;
@@ -11639,44 +13830,18 @@ app.post("/api/teamspace/project-ids/sync", requireUser, async (req, res) => {
       billing_type: string | null;
     }>(
       `
-        SELECT DISTINCT ON (entry_id, api_project_id)
-          entry_id,
-          api_project_id::text AS api_project_id,
-          project_id,
-          label,
-          is_subentry,
-          billing_type
-        FROM (
-          SELECT
-            pte.id::text AS entry_id,
-            pte.teamspace_api_project_id AS api_project_id,
-            pte.teamspace_project AS project_id,
-            NULLIF(btrim(pte.teamspace_description), '') AS label,
-            false AS is_subentry,
-            NULL::text AS billing_type,
-            0 AS display_order
-          FROM project_teamspace_entries pte
-          WHERE pte.id = ANY($2::bigint[])
-            AND pte.teamspace_api_project_id IS NOT NULL
-
-          UNION ALL
-
-          SELECT
-            pte.id::text AS entry_id,
-            pts.teamspace_api_project_id AS api_project_id,
-            pts.teamspace_project_id AS project_id,
-            COALESCE(NULLIF(btrim(pts.alias), ''), NULLIF(btrim(pts.name), ''), pts.teamspace_project_id) AS label,
-            true AS is_subentry,
-            pts.billing_type,
-            pts.display_order + 1 AS display_order
-          FROM project_teamspace_entries pte
-          JOIN project_teamspace_subentries pts ON pts.project_teamspace_entry_id = pte.id
-          WHERE pte.id = ANY($2::bigint[])
-            AND pts.user_id = $1
-        ) api_ids
-        ORDER BY entry_id, api_project_id, display_order ASC;
+        SELECT
+          pte.id::text AS entry_id,
+          pte.teamspace_api_project_id::text AS api_project_id,
+          pte.teamspace_project AS project_id,
+          NULLIF(btrim(pte.teamspace_description), '') AS label,
+          false AS is_subentry,
+          NULL::text AS billing_type
+        FROM project_teamspace_entries pte
+        WHERE pte.id = ANY($1::bigint[])
+          AND pte.teamspace_api_project_id IS NOT NULL;
       `,
-      [user.id, monthSyncEntries.map((entry) => entry.entryId)]
+      [monthSyncEntries.map((entry) => entry.entryId)]
     );
     const apiRowsByEntryId = new Map<string, typeof entryApiIdsResult.rows>();
 
@@ -12008,12 +14173,18 @@ app.patch("/api/auth/me", async (req, res) => {
   const sessionBillingPromptEnabled = user.role === "user"
     ? optionalBoolean(req.body.sessionBillingPromptEnabled, user.session_billing_prompt_enabled)
     : false;
+  const sessionWorkSegmentsEnabled = user.role === "user"
+    ? optionalBoolean(req.body.sessionWorkSegmentsEnabled, user.session_work_segments_enabled)
+    : false;
   const teamspaceTimeTrackingEnabled = user.role === "user"
     ? optionalBoolean(req.body.teamspaceTimeTrackingEnabled, user.teamspace_time_tracking_enabled)
     : true;
   const zammadSessionNoteDefaultEnabled = user.role === "user"
     ? optionalBoolean(req.body.zammadSessionNoteDefaultEnabled, user.zammad_session_note_default_enabled)
     : false;
+  const zammadSessionNoteDateHeaderEnabled = user.role === "user"
+    ? optionalBoolean(req.body.zammadSessionNoteDateHeaderEnabled, user.zammad_session_note_date_header_enabled)
+    : false;
   const zammadTimeUnitRoundingEnabled = user.role === "user"
     ? optionalBoolean(req.body.zammadTimeUnitRoundingEnabled, user.zammad_time_unit_rounding_enabled)
     : false;
@@ -12081,20 +14252,22 @@ app.patch("/api/auth/me", async (req, res) => {
             teamspace_user_id = CASE WHEN $8::boolean THEN $11 ELSE teamspace_user_id END,
             zammad_email_session_webhook_enabled = CASE WHEN $12::boolean THEN $13 ELSE zammad_email_session_webhook_enabled END,
             session_billing_prompt_enabled = CASE WHEN $12::boolean THEN $14 ELSE session_billing_prompt_enabled END,
-            teamspace_time_tracking_enabled = CASE WHEN $12::boolean THEN $15 ELSE teamspace_time_tracking_enabled END,
-            zammad_session_note_default_enabled = CASE WHEN $12::boolean THEN $16 ELSE zammad_session_note_default_enabled END,
-            zammad_time_unit_rounding_enabled = CASE WHEN $12::boolean THEN $17 ELSE zammad_time_unit_rounding_enabled END,
-            zammad_time_unit_rounding_minutes = CASE WHEN $12::boolean THEN $18 ELSE zammad_time_unit_rounding_minutes END,
-            zammad_atoss_email_sync_enabled = CASE WHEN $12::boolean THEN $19 ELSE zammad_atoss_email_sync_enabled END,
-            zammad_article_type_id = CASE WHEN $12::boolean THEN $20 ELSE zammad_article_type_id END,
-            project_followup_enabled = CASE WHEN $12::boolean THEN $21 ELSE project_followup_enabled END,
-            project_followup_weeks = CASE WHEN $12::boolean THEN $22 ELSE project_followup_weeks END,
-            project_followup_second_enabled = CASE WHEN $12::boolean THEN $23 ELSE project_followup_second_enabled END,
-            project_followup_second_weeks = CASE WHEN $12::boolean THEN $24 ELSE project_followup_second_weeks END,
-            project_followup_complete_on_session = CASE WHEN $12::boolean THEN $25 ELSE project_followup_complete_on_session END,
+            session_work_segments_enabled = CASE WHEN $12::boolean THEN $15 ELSE session_work_segments_enabled END,
+            teamspace_time_tracking_enabled = CASE WHEN $12::boolean THEN $16 ELSE teamspace_time_tracking_enabled END,
+            zammad_session_note_default_enabled = CASE WHEN $12::boolean THEN $17 ELSE zammad_session_note_default_enabled END,
+            zammad_session_note_date_header_enabled = CASE WHEN $12::boolean THEN $18 ELSE zammad_session_note_date_header_enabled END,
+            zammad_time_unit_rounding_enabled = CASE WHEN $12::boolean THEN $19 ELSE zammad_time_unit_rounding_enabled END,
+            zammad_time_unit_rounding_minutes = CASE WHEN $12::boolean THEN $20 ELSE zammad_time_unit_rounding_minutes END,
+            zammad_atoss_email_sync_enabled = CASE WHEN $12::boolean THEN $21 ELSE zammad_atoss_email_sync_enabled END,
+            zammad_article_type_id = CASE WHEN $12::boolean THEN $22 ELSE zammad_article_type_id END,
+            project_followup_enabled = CASE WHEN $12::boolean THEN $23 ELSE project_followup_enabled END,
+            project_followup_weeks = CASE WHEN $12::boolean THEN $24 ELSE project_followup_weeks END,
+            project_followup_second_enabled = CASE WHEN $12::boolean THEN $25 ELSE project_followup_second_enabled END,
+            project_followup_second_weeks = CASE WHEN $12::boolean THEN $26 ELSE project_followup_second_weeks END,
+            project_followup_complete_on_session = CASE WHEN $12::boolean THEN $27 ELSE project_followup_complete_on_session END,
             updated_at = now()
         WHERE id = $4
-        RETURNING id, username, display_name, role, active, zammad_user_id::text AS zammad_user_id, (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials, zammad_email_session_webhook_enabled, session_billing_prompt_enabled, teamspace_time_tracking_enabled, zammad_session_note_default_enabled, zammad_time_unit_rounding_enabled, zammad_time_unit_rounding_minutes, zammad_atoss_email_sync_enabled, COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id, project_followup_enabled, project_followup_weeks, project_followup_second_enabled, project_followup_second_weeks, project_followup_complete_on_session;
+        RETURNING id, username, display_name, role, active, zammad_user_id::text AS zammad_user_id, (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials, zammad_email_session_webhook_enabled, session_billing_prompt_enabled, session_work_segments_enabled, teamspace_time_tracking_enabled, zammad_session_note_default_enabled, zammad_session_note_date_header_enabled, zammad_time_unit_rounding_enabled, zammad_time_unit_rounding_minutes, zammad_atoss_email_sync_enabled, COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id, project_followup_enabled, project_followup_weeks, project_followup_second_enabled, project_followup_second_weeks, project_followup_complete_on_session;
       `,
       [
         username,
@@ -12111,8 +14284,10 @@ app.patch("/api/auth/me", async (req, res) => {
         user.role === "user",
         zammadEmailSessionWebhookEnabled,
         sessionBillingPromptEnabled,
+        sessionWorkSegmentsEnabled,
         teamspaceTimeTrackingEnabled,
         zammadSessionNoteDefaultEnabled,
+        zammadSessionNoteDateHeaderEnabled,
         zammadTimeUnitRoundingEnabled,
         zammadTimeUnitRoundingMinutes,
         zammadAtossEmailSyncEnabled,
@@ -12181,7 +14356,7 @@ app.patch("/api/auth/me", async (req, res) => {
 app.get("/api/admin/users", requireAdmin, async (_req, res) => {
   const result = await query(
     `
-      SELECT id, username, display_name, role, active, zammad_user_id::text AS zammad_user_id, (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials, zammad_email_session_webhook_enabled, session_billing_prompt_enabled, teamspace_time_tracking_enabled, zammad_time_unit_rounding_minutes, zammad_session_note_default_enabled, zammad_time_unit_rounding_enabled, zammad_atoss_email_sync_enabled, COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id, project_followup_enabled, project_followup_weeks, project_followup_second_enabled, project_followup_second_weeks, project_followup_complete_on_session, created_at, updated_at
+      SELECT ${adminUserSelectSql}
       FROM users
       ORDER BY username ASC;
     `
@@ -12205,7 +14380,7 @@ app.post("/api/admin/users", requireAdmin, async (req, res) => {
       `
         INSERT INTO users (username, display_name, password_hash, role, active)
         VALUES ($1, $2, $3, $4, $5)
-        RETURNING id, username, display_name, role, active, zammad_user_id::text AS zammad_user_id, (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials, zammad_email_session_webhook_enabled, session_billing_prompt_enabled, teamspace_time_tracking_enabled, zammad_session_note_default_enabled, zammad_time_unit_rounding_enabled, zammad_time_unit_rounding_minutes, zammad_atoss_email_sync_enabled, COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id, project_followup_enabled, project_followup_weeks, project_followup_second_enabled, project_followup_second_weeks, project_followup_complete_on_session, created_at, updated_at;
+        RETURNING ${adminUserSelectSql};
       `,
       [username, displayName, await hashPassword(password), "user", active]
     );
@@ -12266,7 +14441,7 @@ app.patch("/api/admin/users/:userId", requireAdmin, async (req, res) => {
             password_hash = COALESCE($4, password_hash),
             updated_at = now()
         WHERE id = $5
-        RETURNING id, username, display_name, role, active, zammad_user_id::text AS zammad_user_id, (zammad_api_token IS NOT NULL) AS has_zammad_api_token, teamspace_user_id::text AS teamspace_user_id, (teamspace_device_id IS NOT NULL AND teamspace_device_password IS NOT NULL) AS has_teamspace_credentials, zammad_email_session_webhook_enabled, session_billing_prompt_enabled, teamspace_time_tracking_enabled, zammad_session_note_default_enabled, zammad_time_unit_rounding_enabled, zammad_time_unit_rounding_minutes, zammad_atoss_email_sync_enabled, COALESCE(zammad_article_type_id, 6) AS zammad_article_type_id, project_followup_enabled, project_followup_weeks, project_followup_second_enabled, project_followup_second_weeks, project_followup_complete_on_session, created_at, updated_at;
+        RETURNING ${adminUserSelectSql};
       `,
       [username, displayName, active, password ? await hashPassword(password) : null, userId]
     );
@@ -12296,6 +14471,42 @@ app.patch("/api/admin/users/:userId", requireAdmin, async (req, res) => {
   }
 });
 
+app.post("/api/admin/users/:userId/teamspace-initial-actuals/sync", requireAdmin, async (req, res) => {
+  const userId = String(parsePositiveInteger(req.params.userId, "userId"));
+  const fromMonth = req.body?.fromMonth === undefined || req.body?.fromMonth === null || req.body?.fromMonth === ""
+    ? null
+    : parseMonth(String(req.body.fromMonth)).label;
+  const toMonth = req.body?.toMonth === undefined || req.body?.toMonth === null || req.body?.toMonth === ""
+    ? null
+    : parseMonth(String(req.body.toMonth)).label;
+  const result = await runTeamspaceInitialActualsSyncForUser(userId, currentUser(req).id, fromMonth, toMonth);
+
+  res.json({ result });
+});
+
+app.post("/api/admin/users/:userId/teamspace-initial-actuals/unlock", requireAdmin, async (req, res) => {
+  const userId = parsePositiveInteger(req.params.userId, "userId");
+  const result = await query(
+    `
+      UPDATE users
+      SET teamspace_initial_actuals_unlocked_at = now(),
+          teamspace_initial_actuals_unlocked_by = $2,
+          updated_at = now()
+      WHERE id = $1
+        AND role = 'user'
+      RETURNING ${adminUserSelectSql};
+    `,
+    [userId, currentUser(req).id]
+  );
+
+  if (result.rowCount === 0) {
+    res.status(404).json({ error: "User not found" });
+    return;
+  }
+
+  res.json({ user: result.rows[0] });
+});
+
 app.get("/api/organizations", async (req, res) => {
   const search = optionalString(req.query.search);
   const params: unknown[] = [];
@@ -12331,6 +14542,81 @@ app.get("/api/admin/zammad/settings", requireAdmin, async (_req, res) => {
   });
 });
 
+app.get("/api/admin/organizations", requireAdmin, async (req, res) => {
+  const search = optionalString(req.query.search);
+  const missingAssignment = req.query.missingAssignment === "true";
+  const pageSizeRaw = String(req.query.pageSize ?? "20");
+  const pageSize = pageSizeRaw === "all" ? null : parsePositiveInteger(pageSizeRaw, "pageSize");
+  const page = pageSize === null ? 1 : parsePositiveInteger(req.query.page ?? "1", "page");
+  const params: unknown[] = [];
+  const where: string[] = [];
+
+  if (pageSize !== null && ![10, 20, 50, 100].includes(pageSize)) {
+    throw badRequest("pageSize must be one of 10, 20, 50, 100 or all");
+  }
+
+  if (search) {
+    params.push(`%${search}%`);
+    where.push(`(
+      organization.name ILIKE $${params.length}
+      OR organization.zammad_id::text ILIKE $${params.length}
+      OR customer_owner.option_key ILIKE $${params.length}
+      OR customer_owner.display_name ILIKE $${params.length}
+      OR hotline_contract.option_key ILIKE $${params.length}
+      OR hotline_contract.display_name ILIKE $${params.length}
+    )`);
+  }
+
+  if (missingAssignment) {
+    where.push(`(
+      organization.customer_owner_option_id IS NULL
+      OR organization.hotline_contract_option_id IS NULL
+    )`);
+  }
+
+  const whereSql = where.length > 0 ? `WHERE ${where.join(" AND ")}` : "";
+  const fromSql = `
+    FROM organizations organization
+    LEFT JOIN organization_attribute_options customer_owner ON customer_owner.id = organization.customer_owner_option_id
+    LEFT JOIN organization_attribute_options hotline_contract ON hotline_contract.id = organization.hotline_contract_option_id
+  `;
+  const countResult = await query<{ count: string }>(`SELECT COUNT(*)::text AS count ${fromSql} ${whereSql};`, params);
+  const total = Number(countResult.rows[0]?.count ?? 0);
+  const pagingSql = pageSize === null
+    ? ""
+    : `LIMIT $${params.length + 1} OFFSET $${params.length + 2}`;
+  const pagingParams = pageSize === null ? [] : [pageSize, (page - 1) * pageSize];
+  const result = await query<OrganizationRow>(
+    `
+      SELECT
+        organization.zammad_id::text AS id,
+        organization.zammad_id::text AS zammad_id,
+        organization.name,
+        organization.customer_owner_option_id::text AS customer_owner_option_id,
+        customer_owner.option_key AS customer_owner,
+        customer_owner.display_name AS customer_owner_display_name,
+        organization.hotline_contract_option_id::text AS hotline_contract_option_id,
+        hotline_contract.option_key AS hotline_contract,
+        hotline_contract.display_name AS hotline_contract_display_name,
+        organization.synced_at::text AS synced_at,
+        organization.created_at::text AS created_at,
+        organization.updated_at::text AS updated_at
+      ${fromSql}
+      ${whereSql}
+      ORDER BY lower(organization.name) ASC, organization.zammad_id ASC
+      ${pagingSql};
+    `,
+    [...params, ...pagingParams]
+  );
+
+  res.json({
+    organizations: result.rows,
+    total,
+    page,
+    pageSize: pageSize ?? "all"
+  });
+});
+
 app.put("/api/admin/zammad/settings", requireAdmin, async (req, res) => {
   const baseUrl = parseZammadBaseUrl(req.body.baseUrl);
   const apiKey = optionalString(req.body.apiKey);
@@ -12400,15 +14686,298 @@ app.put("/api/admin/teamspace/settings", requireAdmin, async (req, res) => {
 
 type TeamspaceProjectExclusionRow = {
   teamspace_project: string;
+  teamspace_api_project_id: string | null;
+  teamspace_api_project_ids: string[] | null;
   teamspace_name: string | null;
   customer_name: string | null;
+  atoss_support_default: boolean;
+  atoss_support_valid_from: string | null;
+  atoss_support_valid_to: string | null;
+  customer_owner_option_id: string | null;
+  hotline_contract_option_id: string | null;
   note: string;
 };
 
+type TeamspaceProjectExclusionInput = {
+  project: string;
+  atossSupportDefault: boolean;
+  atossSupportValidFrom: string | null;
+  atossSupportValidTo: string | null;
+  customerOwnerOptionId: number | null;
+  hotlineContractOptionId: number | null;
+};
+
+type OrganizationAttributeOptionRow = {
+  id: string;
+  zammad_attribute_id: string;
+  attribute_name: OrganizationAttributeName;
+  option_key: string;
+  display_name: string;
+  active: boolean;
+};
+
+type TeamspaceAssignmentRuleRow = {
+  id: string;
+  name: string;
+  active: boolean;
+  priority: number;
+  customer_owner_option_id: string | null;
+  hotline_contract_option_id: string | null;
+  support_enabled: boolean;
+  consulting_enabled: boolean;
+  teamspace_project: string;
+  created_at: string;
+  updated_at: string;
+};
+
+type TeamspaceAssignmentRuleInput = {
+  id: number | null;
+  name: string;
+  active: boolean;
+  priority: number;
+  customerOwnerOptionId: number | null;
+  hotlineContractOptionId: number | null;
+  supportEnabled: boolean;
+  consultingEnabled: boolean;
+  teamspaceProject: string;
+};
+
+const teamspaceAssignmentRuleSelectSql = `
+  SELECT
+    id::text AS id,
+    name,
+    active,
+    priority,
+    customer_owner_option_id::text AS customer_owner_option_id,
+    hotline_contract_option_id::text AS hotline_contract_option_id,
+    support_enabled,
+    consulting_enabled,
+    teamspace_project,
+    created_at::text AS created_at,
+    updated_at::text AS updated_at
+  FROM teamspace_assignment_rules
+`;
+
+function parseTeamspaceAssignmentRuleInput(value: unknown): TeamspaceAssignmentRuleInput {
+  if (!isPlainObject(value)) {
+    throw badRequest("Zuordnungsregel muss ein Objekt sein");
+  }
+
+  const name = optionalString(value.name);
+  const teamspaceProject = optionalString(value.teamspace_project ?? value.teamspaceProject);
+  const customerOwnerOptionId = parseOptionalPositiveInteger(value.customer_owner_option_id ?? value.customerOwnerOptionId, "customerOwnerOptionId");
+  const hotlineContractOptionId = parseOptionalPositiveInteger(value.hotline_contract_option_id ?? value.hotlineContractOptionId, "hotlineContractOptionId");
+  const supportEnabled = optionalBoolean(value.support_enabled ?? value.supportEnabled, false);
+  const consultingEnabled = optionalBoolean(value.consulting_enabled ?? value.consultingEnabled, false);
+  const priority = value.priority === undefined || value.priority === null || value.priority === ""
+    ? 100
+    : parsePositiveInteger(value.priority, "priority");
+
+  if (!name) {
+    throw badRequest("Regelname ist erforderlich");
+  }
+
+  if (!teamspaceProject) {
+    throw badRequest(`Ziel-TS-Projekt ist für Regel "${name}" erforderlich`);
+  }
+
+  if (priority > 100000) {
+    throw badRequest(`Priorität ist für Regel "${name}" zu groß`);
+  }
+
+  if (customerOwnerOptionId === null && hotlineContractOptionId === null) {
+    throw badRequest(`Regel "${name}" benötigt mindestens eine Bedingung`);
+  }
+
+  if (!supportEnabled && !consultingEnabled) {
+    throw badRequest(`Regel "${name}" muss für Support und/oder Consulting gelten`);
+  }
+
+  return {
+    id: parseOptionalPositiveInteger(value.id, "id"),
+    name,
+    active: optionalBoolean(value.active, true),
+    priority,
+    customerOwnerOptionId,
+    hotlineContractOptionId,
+    supportEnabled,
+    consultingEnabled,
+    teamspaceProject
+  };
+}
+
+app.get("/api/admin/zammad/organization-attribute-options", requireAdmin, async (_req, res) => {
+  const result = await query<OrganizationAttributeOptionRow>(
+    `
+      SELECT
+        id::text AS id,
+        zammad_attribute_id::text AS zammad_attribute_id,
+        attribute_name,
+        option_key,
+        display_name,
+        active
+      FROM organization_attribute_options
+      ORDER BY attribute_name ASC, active DESC, lower(display_name) ASC, lower(option_key) ASC;
+    `
+  );
+
+  res.json({ options: result.rows });
+});
+
+app.get("/api/admin/teamspace/assignment-rules", requireAdmin, async (_req, res) => {
+  const result = await query<TeamspaceAssignmentRuleRow>(
+    `${teamspaceAssignmentRuleSelectSql} ORDER BY priority ASC, id ASC;`
+  );
+
+  res.json({ rules: result.rows });
+});
+
+app.put("/api/admin/teamspace/assignment-rules", requireAdmin, async (req, res) => {
+  if (!Array.isArray(req.body.rules)) {
+    throw badRequest("rules must be an array");
+  }
+
+  const rawRules: unknown[] = req.body.rules;
+  const rules: TeamspaceAssignmentRuleInput[] = rawRules.map(parseTeamspaceAssignmentRuleInput);
+  const suppliedIds = rules.flatMap((rule) => rule.id === null ? [] : [rule.id]);
+
+  if (new Set(suppliedIds).size !== suppliedIds.length) {
+    throw badRequest("Eine Zuordnungsregel wurde mehrfach übermittelt");
+  }
+
+  const requestedOptionIds = [...new Set(rules.flatMap((rule) => [rule.customerOwnerOptionId, rule.hotlineContractOptionId]).filter((id): id is number => id !== null))];
+  const optionAttributesById = new Map<string, OrganizationAttributeName>();
+
+  if (requestedOptionIds.length > 0) {
+    const optionResult = await query<{ id: string; attribute_name: OrganizationAttributeName }>(
+      "SELECT id::text AS id, attribute_name FROM organization_attribute_options WHERE id = ANY($1::bigint[]);",
+      [requestedOptionIds]
+    );
+
+    for (const option of optionResult.rows) {
+      optionAttributesById.set(option.id, option.attribute_name);
+    }
+  }
+
+  for (const rule of rules) {
+    if (rule.customerOwnerOptionId !== null && optionAttributesById.get(String(rule.customerOwnerOptionId)) !== "customer_owner") {
+      throw badRequest(`Ungültige Zugeordnet-Option für Regel "${rule.name}"`);
+    }
+
+    if (rule.hotlineContractOptionId !== null && optionAttributesById.get(String(rule.hotlineContractOptionId)) !== "hotline_contract") {
+      throw badRequest(`Ungültige Hotline-Option für Regel "${rule.name}"`);
+    }
+  }
+
+  const targetProjects = [...new Set(rules.map((rule) => rule.teamspaceProject))];
+
+  if (targetProjects.length > 0) {
+    const targetsResult = await query<{ teamspace_project: string }>(
+      `
+        SELECT teamspace_project
+        FROM teamspace_project_exclusions
+        WHERE lower(btrim(teamspace_project)) = ANY($1::text[]);
+      `,
+      [targetProjects.map((project) => project.toLocaleLowerCase("de"))]
+    );
+    const existingTargets = new Set(targetsResult.rows.map((row) => row.teamspace_project.toLocaleLowerCase("de")));
+    const missingTargets = targetProjects.filter((project) => !existingTargets.has(project.toLocaleLowerCase("de")));
+
+    if (missingTargets.length > 0) {
+      throw badRequest(`Ziel-TS-Projekt ist nicht als Ausnahme gespeichert: ${missingTargets.join(", ")}`);
+    }
+  }
+
+  await withTransaction(async (client) => {
+    const retainedIds: number[] = [];
+
+    for (const rule of rules) {
+      if (rule.id !== null) {
+        const updateResult = await client.query<{ id: string }>(
+          `
+            UPDATE teamspace_assignment_rules
+            SET name = $2,
+                active = $3,
+                priority = $4,
+                customer_owner_option_id = $5,
+                hotline_contract_option_id = $6,
+                support_enabled = $7,
+                consulting_enabled = $8,
+                teamspace_project = $9,
+                updated_at = now()
+            WHERE id = $1
+            RETURNING id::text AS id;
+          `,
+          [rule.id, rule.name, rule.active, rule.priority, rule.customerOwnerOptionId, rule.hotlineContractOptionId, rule.supportEnabled, rule.consultingEnabled, rule.teamspaceProject]
+        );
+
+        if (!updateResult.rows[0]) {
+          throw badRequest(`Zuordnungsregel ${rule.id} wurde nicht gefunden`);
+        }
+
+        retainedIds.push(rule.id);
+        continue;
+      }
+
+      const insertResult = await client.query<{ id: string }>(
+        `
+          INSERT INTO teamspace_assignment_rules (
+            name,
+            active,
+            priority,
+            customer_owner_option_id,
+            hotline_contract_option_id,
+            support_enabled,
+            consulting_enabled,
+            teamspace_project
+          )
+          VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+          RETURNING id::text AS id;
+        `,
+        [rule.name, rule.active, rule.priority, rule.customerOwnerOptionId, rule.hotlineContractOptionId, rule.supportEnabled, rule.consultingEnabled, rule.teamspaceProject]
+      );
+      retainedIds.push(Number(insertResult.rows[0].id));
+    }
+
+    if (retainedIds.length > 0) {
+      await client.query("DELETE FROM teamspace_assignment_rules WHERE NOT (id = ANY($1::bigint[]));", [retainedIds]);
+    } else {
+      await client.query("DELETE FROM teamspace_assignment_rules;");
+    }
+
+    await client.query(
+      `
+        UPDATE tickets
+        SET teamspace_assignment_project = NULL,
+            teamspace_assignment_synced_at = now()
+        WHERE teamspace_assignment_rule_id IS NULL
+          AND teamspace_assignment_project IS NOT NULL;
+      `
+    );
+  });
+
+  const result = await query<TeamspaceAssignmentRuleRow>(
+    `${teamspaceAssignmentRuleSelectSql} ORDER BY priority ASC, id ASC;`
+  );
+
+  res.json({ rules: result.rows });
+});
+
 app.get("/api/admin/teamspace/project-exclusions", requireAdmin, async (_req, res) => {
   const result = await query<TeamspaceProjectExclusionRow>(
     `
-      SELECT teamspace_project, teamspace_name, customer_name, note
+      SELECT
+        teamspace_project,
+        teamspace_api_project_id::text AS teamspace_api_project_id,
+        ARRAY(SELECT value::text FROM unnest(teamspace_api_project_ids) AS value ORDER BY value) AS teamspace_api_project_ids,
+        teamspace_name,
+        customer_name,
+        atoss_support_default,
+        atoss_support_valid_from::text AS atoss_support_valid_from,
+        atoss_support_valid_to::text AS atoss_support_valid_to,
+        customer_owner_option_id::text AS customer_owner_option_id,
+        hotline_contract_option_id::text AS hotline_contract_option_id,
+        note
       FROM teamspace_project_exclusions
       ORDER BY teamspace_project ASC;
     `
@@ -12417,20 +14986,119 @@ app.get("/api/admin/teamspace/project-exclusions", requireAdmin, async (_req, re
   res.json({ exclusions: result.rows });
 });
 
+function parseTeamspaceProjectExclusionInput(value: unknown): TeamspaceProjectExclusionInput | null {
+  if (typeof value === "string") {
+    const project = value.trim();
+    return project
+      ? {
+        project,
+        atossSupportDefault: false,
+        atossSupportValidFrom: null,
+        atossSupportValidTo: null,
+        customerOwnerOptionId: null,
+        hotlineContractOptionId: null
+      }
+      : null;
+  }
+
+  if (!isPlainObject(value)) {
+    return null;
+  }
+
+  const project = optionalString(value.teamspace_project ?? value.project);
+  if (!project) {
+    return null;
+  }
+
+  const atossSupportDefault = optionalBoolean(value.atoss_support_default ?? value.atossSupportDefault, false);
+  const atossSupportValidFrom = parseOptionalDateOnly(value.atoss_support_valid_from ?? value.atossSupportValidFrom, "atossSupportValidFrom");
+  const atossSupportValidTo = parseOptionalDateOnly(value.atoss_support_valid_to ?? value.atossSupportValidTo, "atossSupportValidTo");
+  const customerOwnerOptionId = parseOptionalPositiveInteger(value.customer_owner_option_id ?? value.customerOwnerOptionId, "customerOwnerOptionId");
+  const hotlineContractOptionId = parseOptionalPositiveInteger(value.hotline_contract_option_id ?? value.hotlineContractOptionId, "hotlineContractOptionId");
+
+  if (atossSupportValidFrom && atossSupportValidTo && atossSupportValidTo < atossSupportValidFrom) {
+    throw badRequest("Atoss-Support gültig bis darf nicht vor gültig von liegen");
+  }
+
+  return {
+    project,
+    atossSupportDefault,
+    atossSupportValidFrom,
+    atossSupportValidTo,
+    customerOwnerOptionId,
+    hotlineContractOptionId
+  };
+}
+
+function validateAtossSupportDefaultPeriods(exclusions: TeamspaceProjectExclusionInput[]) {
+  const defaults = exclusions
+    .filter((entry) => entry.atossSupportDefault)
+    .sort((left, right) => {
+      const leftFrom = left.atossSupportValidFrom ?? "0000-01-01";
+      const rightFrom = right.atossSupportValidFrom ?? "0000-01-01";
+      return leftFrom.localeCompare(rightFrom);
+    });
+
+  for (let index = 0; index < defaults.length; index += 1) {
+    const current = defaults[index];
+    const currentTo = current.atossSupportValidTo ?? "9999-12-31";
+
+    for (const next of defaults.slice(index + 1)) {
+      const nextFrom = next.atossSupportValidFrom ?? "0000-01-01";
+      const nextTo = next.atossSupportValidTo ?? "9999-12-31";
+
+      if (nextFrom <= currentTo && nextTo >= (current.atossSupportValidFrom ?? "0000-01-01")) {
+        throw badRequest(`Atoss-Support-Gültigkeiten überschneiden sich: ${current.project} und ${next.project}`);
+      }
+    }
+  }
+}
+
 app.put("/api/admin/teamspace/project-exclusions", requireAdmin, async (req, res) => {
   const rawProjects: unknown[] = Array.isArray(req.body.projects)
     ? req.body.projects
     : typeof req.body.projectsText === "string"
       ? req.body.projectsText.split(/\r?\n|,/)
       : [];
-  const projects = Array.from(new Map(
+  const projectEntries = Array.from(new Map(
     rawProjects
-      .map((value) => typeof value === "string" ? value.trim() : "")
-      .filter(Boolean)
-      .map((value) => [value.toLocaleLowerCase("de"), value])
+      .map(parseTeamspaceProjectExclusionInput)
+      .filter((value): value is TeamspaceProjectExclusionInput => Boolean(value))
+      .map((value) => [value.project.toLocaleLowerCase("de"), value])
   ).values());
+  validateAtossSupportDefaultPeriods(projectEntries);
+  const projects = projectEntries.map((entry) => entry.project);
+
+  const requestedOptionIds = [...new Set(projectEntries.flatMap((entry) => [entry.customerOwnerOptionId, entry.hotlineContractOptionId]).filter((id): id is number => id !== null))];
+  const optionAttributesById = new Map<string, OrganizationAttributeName>();
+
+  if (requestedOptionIds.length > 0) {
+    const optionResult = await query<{ id: string; attribute_name: OrganizationAttributeName }>(
+      `
+        SELECT id::text AS id, attribute_name
+        FROM organization_attribute_options
+        WHERE id = ANY($1::bigint[]);
+      `,
+      [requestedOptionIds]
+    );
+
+    for (const option of optionResult.rows) {
+      optionAttributesById.set(option.id, option.attribute_name);
+    }
+
+    for (const entry of projectEntries) {
+      if (entry.customerOwnerOptionId !== null && optionAttributesById.get(String(entry.customerOwnerOptionId)) !== "customer_owner") {
+        throw badRequest(`Ungültige Zugeordnet-Option für ${entry.project}`);
+      }
+
+      if (entry.hotlineContractOptionId !== null && optionAttributesById.get(String(entry.hotlineContractOptionId)) !== "hotline_contract") {
+        throw badRequest(`Ungültige Hotline-Option für ${entry.project}`);
+      }
+    }
+  }
 
   const remoteProjectsById = new Map<string, TeamspaceRemoteProject>();
+  const exclusionApiIdsByProject = new Map<string, number[]>();
 
   if (projects.length > 0) {
     const credentials = await getTeamspaceCredentialsForAdminAction();
@@ -12439,6 +15107,10 @@ app.put("/api/admin/teamspace/project-exclusions", requireAdmin, async (req, res
     for (const project of remoteProjectsResult.projects) {
       remoteProjectsById.set(project.projectId.toLocaleLowerCase("de"), project);
     }
+
+    for (const project of remoteProjectsResult.projects) {
+      exclusionApiIdsByProject.set(project.projectId.toLocaleLowerCase("de"), [project.apiProjectId]);
+    }
   }
 
   const missingProjects = projects.filter((project) => !remoteProjectsById.has(project.toLocaleLowerCase("de")));
@@ -12452,20 +15124,66 @@ app.put("/api/admin/teamspace/project-exclusions", requireAdmin, async (req, res
 
     for (const project of projects) {
       const remoteProject = remoteProjectsById.get(project.toLocaleLowerCase("de"));
+      const projectEntry = projectEntries.find((entry) => entry.project === project);
+      const apiProjectIds = [...new Set(exclusionApiIdsByProject.get(project.toLocaleLowerCase("de")) ?? [])].sort((left, right) => left - right);
       await client.query(
         `
-          INSERT INTO teamspace_project_exclusions (teamspace_project, teamspace_name, customer_name, updated_at)
-          VALUES ($1, $2, $3, now())
+          INSERT INTO teamspace_project_exclusions (
+            teamspace_project,
+            teamspace_api_project_id,
+            teamspace_api_project_ids,
+            teamspace_name,
+            customer_name,
+            atoss_support_default,
+            atoss_support_valid_from,
+            atoss_support_valid_to,
+            customer_owner_option_id,
+            hotline_contract_option_id,
+            updated_at
+          )
+          VALUES ($1, $2, $3::bigint[], $4, $5, $6, $7::date, $8::date, $9, $10, now())
           ON CONFLICT (teamspace_project)
           DO UPDATE SET
+            teamspace_api_project_id = EXCLUDED.teamspace_api_project_id,
+            teamspace_api_project_ids = EXCLUDED.teamspace_api_project_ids,
             teamspace_name = EXCLUDED.teamspace_name,
             customer_name = EXCLUDED.customer_name,
+            atoss_support_default = EXCLUDED.atoss_support_default,
+            atoss_support_valid_from = EXCLUDED.atoss_support_valid_from,
+            atoss_support_valid_to = EXCLUDED.atoss_support_valid_to,
+            customer_owner_option_id = EXCLUDED.customer_owner_option_id,
+            hotline_contract_option_id = EXCLUDED.hotline_contract_option_id,
             updated_at = now();
         `,
-        [project, remoteProject?.name ?? remoteProject?.description ?? null, remoteProject?.customerName ?? null]
+        [
+          project,
+          remoteProject?.apiProjectId ?? null,
+          apiProjectIds,
+          remoteProject?.name ?? remoteProject?.description ?? null,
+          remoteProject?.customerName ?? null,
+          projectEntry?.atossSupportDefault ?? false,
+          projectEntry?.atossSupportValidFrom ?? null,
+          projectEntry?.atossSupportValidTo ?? null,
+          projectEntry?.customerOwnerOptionId ?? null,
+          projectEntry?.hotlineContractOptionId ?? null
+        ]
       );
     }
 
+    await client.query(
+      `
+        UPDATE teamspace_assignment_rules rule
+        SET active = false,
+            updated_at = now()
+        WHERE NOT EXISTS (
+          SELECT 1
+          FROM teamspace_project_exclusions exclusion
+          WHERE lower(btrim(exclusion.teamspace_project)) = lower(btrim(rule.teamspace_project))
+        )
+          AND rule.active = true;
+      `
+    );
+
     await client.query(
       `
         UPDATE project_teamspace_entries pte
@@ -12489,11 +15207,52 @@ app.put("/api/admin/teamspace/project-exclusions", requireAdmin, async (req, res
         );
       `
     );
+
+    await client.query(
+      `
+        UPDATE project_teamspace_entries entry
+        SET teamspace_api_project_id = exclusion.teamspace_api_project_id,
+            teamspace_description = COALESCE(exclusion.teamspace_name, entry.teamspace_description),
+            updated_at = now()
+        FROM projects target_project
+        JOIN tickets target_ticket ON target_ticket.id = target_project.ticket_id
+        JOIN teamspace_project_exclusions exclusion ON true
+        WHERE entry.project_id = target_project.id
+          AND target_ticket.ticket_number = $1
+          AND lower(btrim(entry.teamspace_project)) = lower(btrim(exclusion.teamspace_project));
+      `,
+      [teamspaceAssignmentTargetTicketNumber]
+    );
+
+    const fallbackTickets = await client.query<{ id: string }>(
+      `
+        SELECT id::text AS id
+        FROM tickets
+        WHERE work_type = 'support'
+          AND atoss_support = true
+        ORDER BY id ASC;
+      `
+    );
+
+    for (const ticket of fallbackTickets.rows) {
+      await refreshSyncedTeamspaceAssignment(client, ticket.id);
+    }
   });
 
   const result = await query<TeamspaceProjectExclusionRow>(
     `
-      SELECT teamspace_project, teamspace_name, customer_name, note
+      SELECT
+        teamspace_project,
+        teamspace_api_project_id::text AS teamspace_api_project_id,
+        ARRAY(SELECT value::text FROM unnest(teamspace_api_project_ids) AS value ORDER BY value) AS teamspace_api_project_ids,
+        teamspace_name,
+        customer_name,
+        atoss_support_default,
+        atoss_support_valid_from::text AS atoss_support_valid_from,
+        atoss_support_valid_to::text AS atoss_support_valid_to,
+        customer_owner_option_id::text AS customer_owner_option_id,
+        hotline_contract_option_id::text AS hotline_contract_option_id,
+        note
       FROM teamspace_project_exclusions
       ORDER BY teamspace_project ASC;
     `
@@ -12514,11 +15273,37 @@ app.post("/api/admin/zammad/organizations/sync", requireAdmin, async (req, res)
     throw badRequest("apiKey is required");
   }
 
+  const requestHeaders = {
+    Authorization: `Token token=${apiKey}`,
+    Accept: "application/json"
+  };
+  const attributeResponse = await zammadFetch(`${baseUrl}/api/v1/object_manager_attributes`, {
+    headers: requestHeaders
+  });
+
+  if (!attributeResponse.ok) {
+    const body = await attributeResponse.text().catch(() => "");
+    res.status(502).json({
+      error: `Zammad Objektattribute konnten nicht geladen werden (${attributeResponse.status})`,
+      detail: body.slice(0, 500)
+    });
+    return;
+  }
+
+  let attributeOptions: ReturnType<typeof parseZammadOrganizationAttributeOptions>;
+
+  try {
+    attributeOptions = parseZammadOrganizationAttributeOptions(await attributeResponse.json());
+  } catch (error) {
+    res.status(502).json({
+      error: "Zammad Objektattribute konnten nicht verarbeitet werden",
+      detail: errorMessage(error)
+    });
+    return;
+  }
+
   const response = await zammadFetch(`${baseUrl}/api/v1/organizations`, {
-    headers: {
-      Authorization: `Token token=${apiKey}`,
-      Accept: "application/json"
-    }
+    headers: requestHeaders
   });
 
   if (!response.ok) {
@@ -12545,6 +15330,8 @@ app.post("/api/admin/zammad/organizations/sync", requireAdmin, async (req, res)
       const raw = item as Record<string, unknown>;
       const zammadId = Number(raw.id);
       const name = typeof raw.name === "string" ? raw.name.trim() : "";
+      const customerOwner = optionalString(raw.customer_owner);
+      const hotlineContract = optionalString(raw.hotline_contract);
 
       if (!Number.isInteger(zammadId) || zammadId <= 0 || name.length === 0) {
         return null;
@@ -12552,26 +15339,82 @@ app.post("/api/admin/zammad/organizations/sync", requireAdmin, async (req, res)
 
       return {
         zammadId,
-        name
+        name,
+        customerOwner,
+        hotlineContract
       };
     })
     .filter((organization): organization is NonNullable<typeof organization> => Boolean(organization));
 
   const syncResult = await withTransaction(async (client) => {
     let synced = 0;
+    const optionIdsByAttributeAndKey = new Map<string, string>();
+
+    await client.query(
+      `
+        UPDATE organization_attribute_options
+        SET active = false,
+            synced_at = now(),
+            updated_at = now()
+        WHERE attribute_name = ANY($1::text[]);
+      `,
+      [[...organizationAttributeNames]]
+    );
+
+    for (const option of attributeOptions) {
+      const optionResult = await client.query<{ id: string }>(
+        `
+          INSERT INTO organization_attribute_options (
+            zammad_attribute_id,
+            attribute_name,
+            option_key,
+            display_name,
+            active,
+            synced_at,
+            updated_at
+          )
+          VALUES ($1, $2, $3, $4, true, now(), now())
+          ON CONFLICT (attribute_name, option_key)
+          DO UPDATE SET
+            zammad_attribute_id = EXCLUDED.zammad_attribute_id,
+            display_name = EXCLUDED.display_name,
+            active = true,
+            synced_at = now(),
+            updated_at = now()
+          RETURNING id::text AS id;
+        `,
+        [option.zammadAttributeId, option.attributeName, option.optionKey, option.displayName]
+      );
+      const optionId = optionResult.rows[0]?.id;
+
+      if (!optionId) {
+        throw new Error(`Attributoption konnte nicht gespeichert werden: ${option.attributeName}/${option.optionKey}`);
+      }
+
+      optionIdsByAttributeAndKey.set(`${option.attributeName}\u0000${option.optionKey}`, optionId);
+    }
 
     for (const organization of organizations) {
+      const customerOwnerOptionId = organization.customerOwner
+        ? optionIdsByAttributeAndKey.get(`customer_owner\u0000${organization.customerOwner}`) ?? null
+        : null;
+      const hotlineContractOptionId = organization.hotlineContract
+        ? optionIdsByAttributeAndKey.get(`hotline_contract\u0000${organization.hotlineContract}`) ?? null
+        : null;
+
       await client.query(
         `
-          INSERT INTO organizations (zammad_id, name, synced_at, updated_at)
-          VALUES ($1, $2, now(), now())
+          INSERT INTO organizations (zammad_id, name, customer_owner_option_id, hotline_contract_option_id, synced_at, updated_at)
+          VALUES ($1, $2, $3, $4, now(), now())
           ON CONFLICT (zammad_id)
           DO UPDATE SET
             name = EXCLUDED.name,
+            customer_owner_option_id = EXCLUDED.customer_owner_option_id,
+            hotline_contract_option_id = EXCLUDED.hotline_contract_option_id,
             synced_at = now(),
             updated_at = now();
         `,
-        [organization.zammadId, organization.name]
+        [organization.zammadId, organization.name, customerOwnerOptionId, hotlineContractOptionId]
       );
       synced += 1;
     }
@@ -12633,6 +15476,7 @@ app.post("/api/admin/zammad/organizations/sync", requireAdmin, async (req, res)
 
     return {
       synced,
+      attributeOptions: attributeOptions.length,
       removed,
       unlinkedTickets,
       unlinkedSessions
@@ -12925,6 +15769,9 @@ function parseRecurringBillingPayload(body: Record<string, unknown>) {
   const organizationId = parseOrganizationId(body.organizationId);
   const activity = requireString(body.activity, "activity");
   const workType = parseWorkType(body.workType);
+  const teamspaceProject = optionalString(body.teamspaceProject);
+  const hourBudgetMinutes = parseOptionalNonNegativeInteger(body.hourBudgetMinutes, "hourBudgetMinutes");
+  const manualConsumptionMinutes = parseOptionalNonNegativeInteger(body.manualConsumptionMinutes, "manualConsumptionMinutes") ?? 0;
   const recurrenceType = parseRecurrenceType(body.recurrenceType);
   const intervalValue = recurrenceType === "weekly" ? 1 : Math.max(1, parsePositiveInteger(body.intervalValue ?? 1, "intervalValue"));
   const validFrom = parseDay(requireString(body.validFrom, "validFrom")).start;
@@ -12937,6 +15784,9 @@ function parseRecurringBillingPayload(body: Record<string, unknown>) {
     organizationId,
     activity,
     workType,
+    teamspaceProject,
+    hourBudgetMinutes,
+    manualConsumptionMinutes,
     recurrenceType,
     intervalValue,
     validFrom,
@@ -12960,6 +15810,9 @@ async function recurringBillingResponse(userId: string) {
         o.name AS organization_name,
         rb.activity,
         rb.work_type,
+        rb.teamspace_project,
+        rb.hour_budget_minutes,
+        rb.manual_consumption_minutes,
         rb.recurrence_type,
         rb.interval_value,
         rb.valid_from::text,
@@ -13017,13 +15870,16 @@ app.post("/api/recurring-billings", requireUser, async (req, res) => {
           organization_id,
           activity,
           work_type,
+          teamspace_project,
+          hour_budget_minutes,
+          manual_consumption_minutes,
           recurrence_type,
           interval_value,
           valid_from,
           valid_until,
           start_time
         )
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8::date, $9::date, $10::time)
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11::date, $12::date, $13::time)
         RETURNING id;
       `,
       [
@@ -13032,6 +15888,9 @@ app.post("/api/recurring-billings", requireUser, async (req, res) => {
         organization.id,
         payload.activity,
         payload.workType,
+        payload.teamspaceProject,
+        payload.hourBudgetMinutes,
+        payload.manualConsumptionMinutes,
         payload.recurrenceType,
         payload.intervalValue,
         payload.validFrom,
@@ -13050,6 +15909,29 @@ app.post("/api/recurring-billings", requireUser, async (req, res) => {
       );
     }
 
+    const ticketNumber = payload.ticketNumber ?? `Fix#${billingResult.rows[0].id}`;
+    const ticketResult = await client.query<{ id: string }>(
+      `
+        INSERT INTO tickets (user_id, ticket_number, organization_id, customer_name, work_type)
+        VALUES ($1, $2, $3, $4, $5)
+        ON CONFLICT (ticket_number)
+        DO UPDATE SET
+          user_id = COALESCE(tickets.user_id, EXCLUDED.user_id),
+          organization_id = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN EXCLUDED.organization_id ELSE tickets.organization_id END,
+          customer_name = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN EXCLUDED.customer_name ELSE tickets.customer_name END,
+          work_type = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN EXCLUDED.work_type ELSE tickets.work_type END
+        RETURNING id::text;
+      `,
+      [userId, ticketNumber, organization.id, organization.name, payload.workType]
+    );
+
+    await ensureRecurringBillingProjectConfiguration(client, ticketResult.rows[0].id, userId, {
+      workType: payload.workType,
+      teamspaceProject: payload.teamspaceProject,
+      hourBudgetMinutes: payload.hourBudgetMinutes,
+      manualConsumptionMinutes: payload.manualConsumptionMinutes
+    });
+
     return billingResult.rows[0].id;
   });
 
@@ -13071,6 +15953,9 @@ app.patch("/api/recurring-billings/:billingId", requireUser, async (req, res) =>
     body.organizationId === undefined &&
     body.activity === undefined &&
     body.workType === undefined &&
+    body.teamspaceProject === undefined &&
+    body.hourBudgetMinutes === undefined &&
+    body.manualConsumptionMinutes === undefined &&
     body.recurrenceType === undefined &&
     body.intervalValue === undefined &&
     body.validFrom === undefined &&
@@ -13140,21 +16025,27 @@ app.patch("/api/recurring-billings/:billingId", requireUser, async (req, res) =>
             organization_id = $2,
             activity = $3,
             work_type = $4,
-            recurrence_type = $5,
-            interval_value = $6,
-            valid_from = $7::date,
-            valid_until = $8::date,
-            start_time = $9::time,
-            active = $10,
+            teamspace_project = $5,
+            hour_budget_minutes = $6,
+            manual_consumption_minutes = $7,
+            recurrence_type = $8,
+            interval_value = $9,
+            valid_from = $10::date,
+            valid_until = $11::date,
+            start_time = $12::time,
+            active = $13,
             updated_at = now()
-        WHERE id = $11
-          AND user_id = $12;
+        WHERE id = $14
+          AND user_id = $15;
       `,
       [
         payload.ticketNumber,
         organization.id,
         payload.activity,
         payload.workType,
+        payload.teamspaceProject,
+        payload.hourBudgetMinutes,
+        payload.manualConsumptionMinutes,
         payload.recurrenceType,
         payload.intervalValue,
         payload.validFrom,
@@ -13254,21 +16145,29 @@ app.patch("/api/recurring-billings/:billingId", requireUser, async (req, res) =>
         ON CONFLICT (ticket_number)
         DO UPDATE SET
           user_id = COALESCE(tickets.user_id, EXCLUDED.user_id),
-          organization_id = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN COALESCE(tickets.organization_id, EXCLUDED.organization_id) ELSE tickets.organization_id END,
-          customer_name = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN COALESCE(tickets.customer_name, EXCLUDED.customer_name) ELSE tickets.customer_name END,
+          organization_id = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN EXCLUDED.organization_id ELSE tickets.organization_id END,
+          customer_name = CASE WHEN tickets.user_id IS NULL OR tickets.user_id = EXCLUDED.user_id THEN EXCLUDED.customer_name ELSE tickets.customer_name END,
           work_type = CASE
             WHEN tickets.user_id IS NOT NULL AND tickets.user_id <> EXCLUDED.user_id THEN tickets.work_type
-            WHEN EXCLUDED.work_type = 'consulting' THEN 'consulting'
-            ELSE COALESCE(tickets.work_type, EXCLUDED.work_type)
+            ELSE EXCLUDED.work_type
           END
         RETURNING id;
       `,
       [targetTicketNumber, organization.id, organization.name, payload.workType, userId]
     );
 
-    if (payload.workType === "consulting") {
-      await ensureProjectForTicket(client, targetTicketResult.rows[0].id, userId);
-    }
+    const projectTeamspaceEntryId = await ensureRecurringBillingProjectConfiguration(
+      client,
+      targetTicketResult.rows[0].id,
+      userId,
+      {
+        workType: payload.workType,
+        teamspaceProject: payload.teamspaceProject,
+        hourBudgetMinutes: payload.hourBudgetMinutes,
+        manualConsumptionMinutes: payload.manualConsumptionMinutes,
+        removeProjectWhenUnconfigured: true
+      }
+    );
 
     const updatedSessions = await client.query<{ ticket_id: string; started_at: string }>(
       `
@@ -13281,7 +16180,8 @@ app.patch("/api/recurring-billings/:billingId", requireUser, async (req, res) =>
             started_at = (s.recurring_occurrence_date::timestamp + slot.start_time)::timestamptz,
             ended_at = ((s.recurring_occurrence_date::timestamp + slot.start_time) + (slot.duration_minutes || ' minutes')::interval)::timestamptz,
             duration_seconds = slot.duration_minutes * 60,
-            rounded_minutes = slot.duration_minutes
+            rounded_minutes = slot.duration_minutes,
+            project_teamspace_entry_id = $10
         FROM recurring_billing_slots slot
         WHERE s.recurring_billing_id = $1
           AND s.user_id = $2
@@ -13300,7 +16200,8 @@ app.patch("/api/recurring-billings/:billingId", requireUser, async (req, res) =>
         payload.activity,
         payload.workType,
         payload.validFrom,
-        payload.validUntil
+        payload.validUntil,
+        projectTeamspaceEntryId
       ]
     );
 
@@ -13415,21 +16316,11 @@ app.post("/api/timers", requireUser, async (req, res) => {
   const projectName = optionalNullableString(req.body.projectName);
   const ticketLookupDone = optionalBoolean(req.body.ticketLookupDone, false);
   const activityHtml = optionalZammadArticleHtml(req.body.zammadArticleBody);
+  const workSegments = workSegmentsForNewTimer(Boolean(user.session_work_segments_enabled), startedAt, pausedAt);
 
   const timers = await withTransaction(async (client) => {
     if (phase === "running") {
-      await client.query(
-        `
-          UPDATE active_timers
-          SET phase = 'paused',
-              paused_at = COALESCE(paused_at, now()),
-              updated_at = now()
-          WHERE user_id = $1
-            AND ticket_number <> $2
-            AND phase = 'running';
-        `,
-        [user.id, ticketNumber]
-      );
+      await pauseOtherRunningTimers(client, user.id, new Date(), { exceptTicketNumber: ticketNumber }, Boolean(user.session_work_segments_enabled));
     }
 
     await client.query(
@@ -13448,9 +16339,10 @@ app.post("/api/timers", requireUser, async (req, res) => {
           started_at,
           paused_total_ms,
           paused_at,
+          work_segments,
           phase
         )
-        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14::jsonb, $15)
         ON CONFLICT (user_id, ticket_number)
         DO UPDATE SET
           organization_name = EXCLUDED.organization_name,
@@ -13464,6 +16356,7 @@ app.post("/api/timers", requireUser, async (req, res) => {
           started_at = EXCLUDED.started_at,
           paused_total_ms = EXCLUDED.paused_total_ms,
           paused_at = EXCLUDED.paused_at,
+          work_segments = EXCLUDED.work_segments,
           phase = EXCLUDED.phase,
           updated_at = now();
       `,
@@ -13481,6 +16374,7 @@ app.post("/api/timers", requireUser, async (req, res) => {
         startedAt.toISOString(),
         pausedTotalMs,
         pausedAt?.toISOString() ?? null,
+        JSON.stringify(workSegments),
         phase
       ]
     );
@@ -13525,6 +16419,25 @@ app.patch("/api/timers/:timerId", requireUser, async (req, res) => {
         ? currentPausedAt ?? now
         : now
       : null;
+    const currentWorkSegments = normalizeWorkSegments(current.work_segments);
+    const nextWorkSegments = (() => {
+      if (!user.session_work_segments_enabled) {
+        return [];
+      }
+
+      if (nextPhase === "paused") {
+        const segments = currentWorkSegments.length > 0
+          ? currentWorkSegments
+          : [{ startedAt: new Date(current.started_at).toISOString(), endedAt: null }];
+        return current.phase === "running" ? closeOpenWorkSegment(segments, now) : segments;
+      }
+
+      if (current.phase === "paused" || !currentWorkSegments.some((segment) => segment.endedAt === null)) {
+        return appendOpenWorkSegment(currentWorkSegments, current.phase === "running" ? new Date(current.started_at) : now);
+      }
+
+      return currentWorkSegments;
+    })();
     const activity = req.body.activity === undefined
       ? current.activity
       : typeof req.body.activity === "string"
@@ -13539,18 +16452,7 @@ app.patch("/api/timers/:timerId", requireUser, async (req, res) => {
     const ticketLookupDone = req.body.ticketLookupDone === undefined ? current.ticket_lookup_done : optionalBoolean(req.body.ticketLookupDone, current.ticket_lookup_done);
 
     if (nextPhase === "running") {
-      await client.query(
-        `
-          UPDATE active_timers
-          SET phase = 'paused',
-              paused_at = COALESCE(paused_at, $3),
-              updated_at = now()
-          WHERE user_id = $1
-            AND id <> $2
-            AND phase = 'running';
-        `,
-        [user.id, timerId, now.toISOString()]
-      );
+      await pauseOtherRunningTimers(client, user.id, now, { exceptId: timerId }, Boolean(user.session_work_segments_enabled));
     }
 
     await client.query(
@@ -13566,7 +16468,8 @@ app.patch("/api/timers/:timerId", requireUser, async (req, res) => {
             billing_status = $10,
             paused_total_ms = $11,
             paused_at = $12,
-            phase = $13,
+            work_segments = $13::jsonb,
+            phase = $14,
             updated_at = now()
         WHERE id = $1
           AND user_id = $2;
@@ -13584,6 +16487,7 @@ app.patch("/api/timers/:timerId", requireUser, async (req, res) => {
         billingStatus,
         nextPausedTotalMs,
         nextPausedAt?.toISOString() ?? null,
+        JSON.stringify(nextWorkSegments),
         nextPhase
       ]
     );
@@ -13623,10 +16527,12 @@ app.post("/api/sessions", requireUser, async (req, res) => {
   const requestedProjectTeamspaceEntryId = parseOptionalTeamspaceEntryId(req.body.projectTeamspaceEntryId);
   const billingStatus = req.body.billingStatus === undefined ? null : parseBillingStatus(req.body.billingStatus);
   const createZammadArticle = optionalBoolean(req.body.createZammadArticle, false);
+  const zammadArticleDateHeader = optionalBoolean(req.body.zammadArticleDateHeader, false) && Boolean(user.zammad_session_note_date_header_enabled);
   const zammadArticleTypeId = parseZammadArticleTypeId(req.body.zammadArticleTypeId, user.zammad_article_type_id);
   const startedAt = parseIsoDate(req.body.startedAt, "startedAt");
   const endedAt = parseIsoDate(req.body.endedAt, "endedAt");
   const durationSeconds = parsePositiveInteger(req.body.durationSeconds, "durationSeconds");
+  const workSegments = user.session_work_segments_enabled ? workSegmentsForSession(req.body.workSegments, startedAt, endedAt) : [];
 
   const created = await createSessionForUser({
     userId: user.id,
@@ -13639,7 +16545,9 @@ app.post("/api/sessions", requireUser, async (req, res) => {
     requestedProjectTeamspaceEntryId,
     billingStatus,
     createZammadArticle,
+    zammadArticleDateHeader,
     zammadArticleTypeId,
+    workSegments,
     startedAt,
     endedAt,
     durationSeconds
@@ -14114,7 +17022,7 @@ async function runExistingZammadSync(
       }
 
       if (!dryRun) {
-        const status = await withTransaction(async (client) => applyZammadTicketSync(client, localTicket, zammadTicket, userId, fields));
+        const status = await withTransaction(async (client) => applyZammadTicketSyncWithAssignment(client, localTicket, zammadTicket, userId, fields));
 
         if (status === "organization-missing" || status === "not-owner") {
           const item = {
@@ -14287,7 +17195,7 @@ async function runExistingZammadSyncFromPreview(
         continue;
       }
 
-      const status = await withTransaction(async (client) => applyZammadTicketSync(client, localTicket, zammadTicket, userId, fields));
+      const status = await withTransaction(async (client) => applyZammadTicketSyncWithAssignment(client, localTicket, zammadTicket, userId, fields));
 
       if (status === "organization-missing" || status === "not-owner") {
         updateZammadSyncResultFromItem(result, {
@@ -14527,7 +17435,9 @@ async function runZammadMailSessionImport(userId: string, daysBack: number, perP
           requestedProjectTeamspaceEntryId: null,
           billingStatus: "billable",
           createZammadArticle: false,
+          zammadArticleDateHeader: false,
           zammadArticleTypeId: 6,
+          workSegments: [],
           startedAt,
           endedAt,
           durationSeconds: article.durationSeconds,
@@ -14631,7 +17541,9 @@ async function runZammadMailSessionImportFromPreview(userId: string, previewResu
         requestedProjectTeamspaceEntryId: null,
         billingStatus: "billable",
         createZammadArticle: false,
+        zammadArticleDateHeader: false,
         zammadArticleTypeId: 6,
+        workSegments: [],
         startedAt,
         endedAt,
         durationSeconds: article.durationSeconds,
@@ -15450,6 +18362,9 @@ app.get("/api/projects/:projectId", requireUser, async (req, res) => {
 });
 
 app.post("/api/projects/:projectId/teamspace-subentries/sync", requireUser, async (req, res) => {
+  res.status(410).json({ error: "Teamspace-Unterpositionen werden nicht mehr in TicketTracker gespeichert. Zeiten werden dem Hauptprojekt zugeordnet." });
+  return;
+  /* Legacy implementation retained temporarily for migration reference.
   const user = currentUser(req);
   const projectId = parsePositiveInteger(req.params.projectId, "projectId");
 
@@ -15576,10 +18491,13 @@ app.post("/api/projects/:projectId/teamspace-subentries/sync", requireUser, asyn
     teamspaceTimeBillableMinutes
   };
 
-  res.json({ result });
+  res.json({ result }); */
 });
 
 app.post("/api/teamspace/subentries/sync", requireUser, async (req, res) => {
+  res.status(410).json({ error: "Teamspace-Unterpositionen werden nicht mehr in TicketTracker gespeichert. Zeiten werden dem Hauptprojekt zugeordnet." });
+  return;
+  /* Legacy implementation retained temporarily for migration reference.
   const user = currentUser(req);
 
   const entriesResult = await query<TeamspaceSubentrySyncEntry & { project_id: string }>(
@@ -15651,10 +18569,13 @@ app.post("/api/teamspace/subentries/sync", requireUser, async (req, res) => {
     subentriesRemoved: syncResult.removed
   };
 
-  res.json({ result });
+  res.json({ result }); */
 });
 
 app.patch("/api/project-teamspace-subentries/:subentryId", requireUser, async (req, res) => {
+	  res.status(410).json({ error: "Teamspace-Unterpositionen werden nicht mehr in TicketTracker gespeichert." });
+	  return;
+  /* Legacy implementation retained temporarily for migration reference.
 		  const userId = currentUser(req).id;
 		  const subentryId = parsePositiveInteger(req.params.subentryId, "subentryId");
 		  const alias = optionalString(req.body.alias) ?? "";
@@ -15731,7 +18652,7 @@ app.patch("/api/project-teamspace-subentries/:subentryId", requireUser, async (r
     return;
   }
 
-  res.json({ subentry: result });
+  res.json({ subentry: result }); */
 });
 
 app.post("/api/projects", requireUser, async (req, res) => {
@@ -15848,6 +18769,10 @@ app.post("/api/projects", requireUser, async (req, res) => {
         return "not-owner" as const;
       }
 
+      if (existingTicket.rows[0] && await ticketHasRecurringBilling(client, existingTicket.rows[0].ticket_number, userId)) {
+        return "recurring-managed-ticket" as const;
+      }
+
       if (
         existingTicket.rows[0]?.zammad_ticket_id
         && (
@@ -16057,6 +18982,11 @@ app.post("/api/projects", requireUser, async (req, res) => {
       return;
     }
 
+    if (created === "recurring-managed-ticket") {
+      res.status(409).json({ error: "Projektdaten einer Fixabrechnung können nur in der Definition der fixen Abrechnung geändert werden." });
+      return;
+    }
+
     res.status(201).json({ project: created });
   } catch (error: any) {
     if (error?.code === "23505") {
@@ -16144,6 +19074,11 @@ app.patch("/api/projects/:projectId", requireUser, async (req, res) => {
       }
 
       const projectTicket = projectResult.rows[0];
+
+      if (await ticketHasRecurringBilling(client, projectTicket.ticket_number, userId)) {
+        return "recurring-managed-ticket" as const;
+      }
+
       const zammadManagedTicket = Boolean(projectTicket.zammad_ticket_id);
 
       if (
@@ -16404,6 +19339,11 @@ app.patch("/api/projects/:projectId", requireUser, async (req, res) => {
       return;
     }
 
+    if (updated === "recurring-managed-ticket") {
+      res.status(409).json({ error: "Projektdaten einer Fixabrechnung können nur in der Definition der fixen Abrechnung geändert werden." });
+      return;
+    }
+
     if (!updated) {
       res.status(404).json({ error: "Projekt nicht gefunden" });
       return;
@@ -16426,11 +19366,12 @@ app.patch("/api/projects/:projectId/review", requireUser, async (req, res) => {
   const acknowledged = optionalBoolean(req.body.acknowledged, true);
 
   const result = await withTransaction(async (client) => {
-    const projectResult = await client.query<{ id: string; ticket_id: string }>(
+    const projectResult = await client.query<{ id: string; ticket_id: string; ticket_number: string }>(
       `
-        SELECT id::text, ticket_id::text
-        FROM projects
-        WHERE id = $1
+        SELECT p.id::text, p.ticket_id::text, t.ticket_number
+        FROM projects p
+        JOIN tickets t ON t.id = p.ticket_id
+        WHERE p.id = $1
         FOR UPDATE;
       `,
       [projectId]
@@ -16444,6 +19385,10 @@ app.patch("/api/projects/:projectId/review", requireUser, async (req, res) => {
       return "not-owner" as const;
     }
 
+    if (await ticketHasRecurringBilling(client, projectResult.rows[0].ticket_number, userId)) {
+      return "recurring-managed-ticket" as const;
+    }
+
     const updateResult = await client.query<{ id: string; ticket_id: string; close_review_required: boolean }>(
       `
         UPDATE projects
@@ -16468,6 +19413,11 @@ app.patch("/api/projects/:projectId/review", requireUser, async (req, res) => {
     return;
   }
 
+  if (result === "recurring-managed-ticket") {
+    res.status(409).json({ error: "Prüfstatus einer Fixabrechnung kann nicht in den Ticketdetails geändert werden." });
+    return;
+  }
+
   res.json({ project: result });
 });
 
@@ -16477,11 +19427,12 @@ app.patch("/api/projects/:projectId/status", requireUser, async (req, res) => {
   const closed = optionalBoolean(req.body.closed, false);
 
   const result = await withTransaction(async (client) => {
-    const projectResult = await client.query<{ id: string; ticket_id: string }>(
+    const projectResult = await client.query<{ id: string; ticket_id: string; ticket_number: string }>(
       `
-        SELECT id::text, ticket_id::text
-        FROM projects
-        WHERE id = $1
+        SELECT p.id::text, p.ticket_id::text, t.ticket_number
+        FROM projects p
+        JOIN tickets t ON t.id = p.ticket_id
+        WHERE p.id = $1
         FOR UPDATE;
       `,
       [projectId]
@@ -16495,6 +19446,10 @@ app.patch("/api/projects/:projectId/status", requireUser, async (req, res) => {
       return "not-owner" as const;
     }
 
+    if (await ticketHasRecurringBilling(client, projectResult.rows[0].ticket_number, userId)) {
+      return "recurring-managed-ticket" as const;
+    }
+
     const updateResult = await client.query<{ id: string; ticket_id: string; closed_at: string | null }>(
       `
         UPDATE projects
@@ -16520,6 +19475,11 @@ app.patch("/api/projects/:projectId/status", requireUser, async (req, res) => {
     return;
   }
 
+  if (result === "recurring-managed-ticket") {
+    res.status(409).json({ error: "Der Projektstatus einer Fixabrechnung wird über die Fixabrechnung verwaltet." });
+    return;
+  }
+
   res.json({ project: result });
 });
 
@@ -16590,12 +19550,13 @@ app.delete("/api/projects/:projectId", requireUser, async (req, res) => {
   const userId = currentUser(req).id;
 
   const result = await withTransaction(async (client) => {
-    const projectResult = await client.query<{ id: string; ticket_id: string }>(
+    const projectResult = await client.query<{ id: string; ticket_id: string; ticket_number: string }>(
       `
-        SELECT id::text, ticket_id::text
-        FROM projects
-        WHERE id = $1
-          AND user_id = $2
+        SELECT p.id::text, p.ticket_id::text, t.ticket_number
+        FROM projects p
+        JOIN tickets t ON t.id = p.ticket_id
+        WHERE p.id = $1
+          AND p.user_id = $2
         FOR UPDATE;
       `,
       [projectId, userId]
@@ -16609,6 +19570,10 @@ app.delete("/api/projects/:projectId", requireUser, async (req, res) => {
       return "not-owner" as const;
     }
 
+    if (await ticketHasRecurringBilling(client, projectResult.rows[0].ticket_number, userId)) {
+      return "recurring-managed-ticket" as const;
+    }
+
     const otherUserSessionResult = await client.query<{ exists: boolean }>(
       `
         SELECT EXISTS (
@@ -16651,6 +19616,11 @@ app.delete("/api/projects/:projectId", requireUser, async (req, res) => {
     return;
   }
 
+  if (result === "recurring-managed-ticket") {
+    res.status(409).json({ error: "Das Projekt einer Fixabrechnung kann nur über die Fixabrechnung verwaltet werden." });
+    return;
+  }
+
   res.json({ deleted: result });
 });
 
@@ -16895,6 +19865,75 @@ app.post("/api/tickets/:ticketId/zammad-mail-sessions", requireUser, async (req,
   res.json(await runTicketZammadMailSessionImport(currentUser(req).id, ticketId, daysBack, false, selectedArticleIds));
 });
 
+app.patch("/api/tickets/:ticketId/atoss-support", requireUser, async (req, res) => {
+  const ticketId = parsePositiveInteger(req.params.ticketId, "ticketId");
+  const atossSupport = optionalBoolean(req.body.atossSupport, false);
+  const userId = currentUser(req).id;
+  const result = await withTransaction(async (client) => {
+    if (!await userCanManageTicket(client, ticketId, userId)) {
+      return "not-owner" as const;
+    }
+
+    const ticketResult = await client.query<{ work_type: "support" | "consulting" | null }>(
+      `
+        SELECT work_type
+        FROM tickets
+        WHERE id = $1
+        FOR UPDATE;
+      `,
+      [ticketId]
+    );
+    const ticket = ticketResult.rows[0];
+
+    if (!ticket) {
+      return null;
+    }
+
+    const ticketNumberResult = await client.query<{ ticket_number: string }>("SELECT ticket_number FROM tickets WHERE id = $1;", [ticketId]);
+    if (ticketNumberResult.rows[0] && await ticketHasRecurringBilling(client, ticketNumberResult.rows[0].ticket_number, userId)) {
+      return "recurring-managed-ticket" as const;
+    }
+
+    if (ticket.work_type !== "support" && atossSupport) {
+      return "support-only" as const;
+    }
+
+    await client.query(
+      `
+        UPDATE tickets
+        SET atoss_support = $2
+        WHERE id = $1;
+      `,
+      [ticketId, atossSupport]
+    );
+    await refreshSyncedTeamspaceAssignment(client, String(ticketId));
+
+    return { atoss_support: atossSupport };
+  });
+
+  if (result === "not-owner") {
+    res.status(403).json({ error: "Nur der Hauptuser kann den Atoss-Support-Fallback ändern" });
+    return;
+  }
+
+  if (result === "support-only") {
+    res.status(409).json({ error: "Atoss Support kann nur für Support-Tickets aktiviert werden" });
+    return;
+  }
+
+  if (result === "recurring-managed-ticket") {
+    res.status(409).json({ error: "Die TS-Zuordnung einer Fixabrechnung kann nur in der Definition der fixen Abrechnung geändert werden." });
+    return;
+  }
+
+  if (!result) {
+    res.status(404).json({ error: "Ticket not found" });
+    return;
+  }
+
+  res.json({ ticket: result });
+});
+
 app.patch("/api/tickets/:ticketId", requireUser, async (req, res) => {
   const ticketId = parsePositiveInteger(req.params.ticketId, "ticketId");
   const ticketNumber = parseTrackableTicketNumber(req.body.ticketNumber);
@@ -16916,9 +19955,9 @@ app.patch("/api/tickets/:ticketId", requireUser, async (req, res) => {
         return "not-owner" as const;
       }
 
-      const currentTicketResult = await client.query<{ zammad_ticket_id: string | null }>(
+      const currentTicketResult = await client.query<{ zammad_ticket_id: string | null; ticket_number: string }>(
         `
-          SELECT zammad_ticket_id::text AS zammad_ticket_id
+          SELECT zammad_ticket_id::text AS zammad_ticket_id, ticket_number
           FROM tickets
           WHERE id = $1
           FOR UPDATE;
@@ -16934,6 +19973,10 @@ app.patch("/api/tickets/:ticketId", requireUser, async (req, res) => {
         return "zammad-managed-ticket" as const;
       }
 
+      if (await ticketHasRecurringBilling(client, currentTicketResult.rows[0].ticket_number, userId)) {
+        return "recurring-managed-ticket" as const;
+      }
+
       const projectsResult = await client.query<{ id: string; user_id: string }>(
         `
           SELECT id::text AS id, user_id::text AS user_id
@@ -16961,7 +20004,8 @@ app.patch("/api/tickets/:ticketId", requireUser, async (req, res) => {
               title = $2,
               organization_id = $3,
               customer_name = $4,
-              work_type = $5
+              work_type = $5,
+              atoss_support = CASE WHEN $5 = 'support' THEN atoss_support ELSE false END
           WHERE id = $6
           RETURNING id, ticket_number, title, organization_id, customer_name, work_type;
         `,
@@ -16991,6 +20035,7 @@ app.patch("/api/tickets/:ticketId", requireUser, async (req, res) => {
         `,
         [organization.id, organization.name, workType, ticketId, userId]
       );
+      await refreshSyncedTeamspaceAssignment(client, String(ticketId));
 
       return ticketResult.rows[0];
     });
@@ -17020,6 +20065,11 @@ app.patch("/api/tickets/:ticketId", requireUser, async (req, res) => {
       return;
     }
 
+    if (result === "recurring-managed-ticket") {
+      res.status(409).json({ error: "Ticketnummer, Art und Organisation kommen aus der fixen Abrechnung und können nur dort geändert werden." });
+      return;
+    }
+
     if (!result) {
       res.status(404).json({ error: "Ticket not found" });
       return;
@@ -17443,6 +20493,7 @@ app.patch("/api/sessions/:sessionId/details", requireUser, async (req, res) => {
       ticket_id: string;
       started_at: string;
       work_type: "support" | "consulting";
+      work_segments: unknown;
       recurring_billing_id: string | null;
       recurring_work_type: "support" | "consulting" | null;
       project_id: string | null;
@@ -17454,6 +20505,7 @@ app.patch("/api/sessions/:sessionId/details", requireUser, async (req, res) => {
           s.ticket_id,
           s.started_at,
           s.work_type,
+          s.work_segments,
           s.recurring_billing_id,
           rb.work_type AS recurring_work_type,
           p.id AS project_id,
@@ -17512,18 +20564,27 @@ app.patch("/api/sessions/:sessionId/details", requireUser, async (req, res) => {
         await ensureProjectForTicket(client, current.ticket_id, ownerUserId);
       }
 
-      const teamspaceAssignment = await resolveProjectTeamspaceAssignmentForSession(
-        client,
-        current.ticket_id,
-        userId,
-        effectiveWorkType,
-        requestedProjectTeamspaceEntryId
-      );
-      projectTeamspaceEntryId = teamspaceAssignment.projectTeamspaceEntryId;
+      projectTeamspaceEntryId = requestedProjectTeamspaceEntryId === null
+        ? await resolveSyncedTeamspaceEntry(client, current.ticket_id, userId)
+        : null;
+
+      if (projectTeamspaceEntryId === null) {
+        const teamspaceAssignment = await resolveProjectTeamspaceAssignmentForSession(
+          client,
+          current.ticket_id,
+          userId,
+          effectiveWorkType,
+          requestedProjectTeamspaceEntryId
+        );
+        projectTeamspaceEntryId = teamspaceAssignment.projectTeamspaceEntryId;
+      }
+    } else {
+      projectTeamspaceEntryId = await resolveSyncedTeamspaceEntry(client, current.ticket_id, userId);
     }
 
     await reopenPeriodsForSession(client, current.ticket_id, new Date(current.started_at), userId);
     await reopenPeriodsForSession(client, current.ticket_id, startedAt, userId);
+    const workSegments = workSegmentsForSession(current.work_segments, startedAt, endedAt);
 
     const result = await client.query(
       `
@@ -17537,9 +20598,10 @@ app.patch("/api/sessions/:sessionId/details", requireUser, async (req, res) => {
             ended_at = $7,
             duration_seconds = $8,
             rounded_minutes = $9,
-            project_teamspace_entry_id = $10
-        WHERE id = $11
-          AND user_id = $12
+            work_segments = $10::jsonb,
+            project_teamspace_entry_id = $11
+        WHERE id = $12
+          AND user_id = $13
         RETURNING *;
       `,
       [
@@ -17552,6 +20614,7 @@ app.patch("/api/sessions/:sessionId/details", requireUser, async (req, res) => {
         endedAt.toISOString(),
         durationSeconds,
         roundedMinutes,
+        JSON.stringify(workSegments),
         projectTeamspaceEntryId,
         sessionId,
         userId
diff --git a/backend/src/migrations.ts b/backend/src/migrations.ts
index bd91128..47f2ed3 100644
--- a/backend/src/migrations.ts
+++ b/backend/src/migrations.ts
@@ -118,8 +118,10 @@ export async function migrate() {
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS teamspace_user_id BIGINT;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS zammad_email_session_webhook_enabled BOOLEAN NOT NULL DEFAULT false;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS session_billing_prompt_enabled BOOLEAN NOT NULL DEFAULT true;");
+  await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS session_work_segments_enabled BOOLEAN NOT NULL DEFAULT false;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS teamspace_time_tracking_enabled BOOLEAN NOT NULL DEFAULT true;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS zammad_session_note_default_enabled BOOLEAN NOT NULL DEFAULT false;");
+  await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS zammad_session_note_date_header_enabled BOOLEAN NOT NULL DEFAULT false;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS zammad_time_unit_rounding_enabled BOOLEAN NOT NULL DEFAULT false;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS zammad_time_unit_rounding_minutes INTEGER NOT NULL DEFAULT 15;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS zammad_atoss_email_sync_enabled BOOLEAN NOT NULL DEFAULT true;");
@@ -129,6 +131,10 @@ export async function migrate() {
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS project_followup_second_enabled BOOLEAN NOT NULL DEFAULT true;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS project_followup_second_weeks INTEGER NOT NULL DEFAULT 2;");
   await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS project_followup_complete_on_session BOOLEAN NOT NULL DEFAULT true;");
+  await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS teamspace_initial_actuals_synced_at TIMESTAMPTZ;");
+  await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS teamspace_initial_actuals_synced_by BIGINT REFERENCES users(id) ON DELETE SET NULL;");
+  await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS teamspace_initial_actuals_unlocked_at TIMESTAMPTZ;");
+  await query("ALTER TABLE users ADD COLUMN IF NOT EXISTS teamspace_initial_actuals_unlocked_by BIGINT REFERENCES users(id) ON DELETE SET NULL;");
   await query("ALTER TABLE users DROP COLUMN IF EXISTS teamspace_subproject_assignment_enabled;");
   await query("UPDATE users SET zammad_article_type_id = 6 WHERE zammad_article_type_id IS NULL;");
   await query("ALTER TABLE users ALTER COLUMN zammad_article_type_id SET DEFAULT 6;");
@@ -182,21 +188,79 @@ export async function migrate() {
     );
   `);
 
+  await query(`
+    CREATE TABLE IF NOT EXISTS organization_attribute_options (
+      id BIGSERIAL PRIMARY KEY,
+      zammad_attribute_id BIGINT NOT NULL,
+      attribute_name TEXT NOT NULL,
+      option_key TEXT NOT NULL,
+      display_name TEXT NOT NULL,
+      active BOOLEAN NOT NULL DEFAULT true,
+      synced_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+      created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+      updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+      CONSTRAINT organization_attribute_options_attribute_valid
+        CHECK (attribute_name IN ('customer_owner', 'hotline_contract')),
+      CONSTRAINT organization_attribute_options_key_not_blank CHECK (btrim(option_key) <> ''),
+      CONSTRAINT organization_attribute_options_display_not_blank CHECK (btrim(display_name) <> ''),
+      UNIQUE (attribute_name, option_key)
+    );
+  `);
+  await query("CREATE INDEX IF NOT EXISTS idx_organization_attribute_options_attribute_active ON organization_attribute_options(attribute_name, active, display_name);");
+
   await query(`
     CREATE TABLE IF NOT EXISTS teamspace_project_exclusions (
       teamspace_project TEXT PRIMARY KEY,
+      teamspace_api_project_id BIGINT,
+      teamspace_api_project_ids BIGINT[] NOT NULL DEFAULT '{}'::bigint[],
       teamspace_name TEXT,
       customer_name TEXT,
+      atoss_support_default BOOLEAN NOT NULL DEFAULT false,
+      atoss_support_valid_from DATE,
+      atoss_support_valid_to DATE,
+      customer_owner_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL,
+      hotline_contract_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL,
       note TEXT NOT NULL DEFAULT '',
       created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
       updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
       CONSTRAINT teamspace_project_exclusions_project_not_blank CHECK (btrim(teamspace_project) <> '')
     );
   `);
+  await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS teamspace_api_project_id BIGINT;");
+  await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS teamspace_api_project_ids BIGINT[] NOT NULL DEFAULT '{}'::bigint[];");
   await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS teamspace_name TEXT;");
   await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS customer_name TEXT;");
+  await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS atoss_support_default BOOLEAN NOT NULL DEFAULT false;");
+  await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS atoss_support_valid_from DATE;");
+  await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS atoss_support_valid_to DATE;");
+  await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS customer_owner_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL;");
+  await query("ALTER TABLE teamspace_project_exclusions ADD COLUMN IF NOT EXISTS hotline_contract_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL;");
   await query("CREATE UNIQUE INDEX IF NOT EXISTS idx_teamspace_project_exclusions_lower ON teamspace_project_exclusions (lower(btrim(teamspace_project)));");
 
+  await query(`
+    CREATE TABLE IF NOT EXISTS teamspace_assignment_rules (
+      id BIGSERIAL PRIMARY KEY,
+      name TEXT NOT NULL,
+      active BOOLEAN NOT NULL DEFAULT true,
+      priority INTEGER NOT NULL DEFAULT 100,
+      customer_owner_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL,
+      hotline_contract_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL,
+      support_enabled BOOLEAN NOT NULL DEFAULT true,
+      consulting_enabled BOOLEAN NOT NULL DEFAULT false,
+      teamspace_project TEXT NOT NULL,
+      created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+      updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+      CONSTRAINT teamspace_assignment_rules_name_not_blank CHECK (btrim(name) <> ''),
+      CONSTRAINT teamspace_assignment_rules_project_not_blank CHECK (btrim(teamspace_project) <> ''),
+      CONSTRAINT teamspace_assignment_rules_priority_valid CHECK (priority BETWEEN 0 AND 100000),
+      CONSTRAINT teamspace_assignment_rules_condition_required CHECK (
+        customer_owner_option_id IS NOT NULL OR hotline_contract_option_id IS NOT NULL
+      ),
+      CONSTRAINT teamspace_assignment_rules_work_type_required CHECK (support_enabled OR consulting_enabled)
+    );
+  `);
+  await query("CREATE INDEX IF NOT EXISTS idx_teamspace_assignment_rules_matching ON teamspace_assignment_rules(active, priority, id);");
+
   await query(`
     CREATE TABLE IF NOT EXISTS teamspace_project_resources (
       id BIGSERIAL PRIMARY KEY,
@@ -234,6 +298,8 @@ export async function migrate() {
       id BIGSERIAL PRIMARY KEY,
       zammad_id BIGINT NOT NULL UNIQUE,
       name TEXT NOT NULL UNIQUE,
+      customer_owner_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL,
+      hotline_contract_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL,
       synced_at TIMESTAMPTZ NOT NULL DEFAULT now(),
       created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
       updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
@@ -246,6 +312,58 @@ export async function migrate() {
   await query("ALTER TABLE organizations DROP COLUMN IF EXISTS domain;");
   await query("ALTER TABLE organizations DROP COLUMN IF EXISTS note;");
   await query("ALTER TABLE organizations DROP COLUMN IF EXISTS zammad_updated_at;");
+  await query("ALTER TABLE organizations ADD COLUMN IF NOT EXISTS customer_owner_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL;");
+  await query("ALTER TABLE organizations ADD COLUMN IF NOT EXISTS hotline_contract_option_id BIGINT REFERENCES organization_attribute_options(id) ON DELETE SET NULL;");
+  await query(`
+    DO $$
+    BEGIN
+      IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'organizations'
+          AND column_name = 'customer_owner'
+      ) THEN
+        INSERT INTO organization_attribute_options (zammad_attribute_id, attribute_name, option_key, display_name, active)
+        SELECT 0, 'customer_owner', btrim(customer_owner), btrim(customer_owner), false
+        FROM organizations
+        WHERE customer_owner IS NOT NULL AND btrim(customer_owner) <> ''
+        ON CONFLICT (attribute_name, option_key) DO NOTHING;
+
+        UPDATE organizations organization
+        SET customer_owner_option_id = option.id
+        FROM organization_attribute_options option
+        WHERE option.attribute_name = 'customer_owner'
+          AND option.option_key = btrim(organization.customer_owner)
+          AND organization.customer_owner_option_id IS NULL;
+
+        ALTER TABLE organizations DROP COLUMN customer_owner;
+      END IF;
+
+      IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'organizations'
+          AND column_name = 'hotline_contract'
+      ) THEN
+        INSERT INTO organization_attribute_options (zammad_attribute_id, attribute_name, option_key, display_name, active)
+        SELECT 0, 'hotline_contract', btrim(hotline_contract), btrim(hotline_contract), false
+        FROM organizations
+        WHERE hotline_contract IS NOT NULL AND btrim(hotline_contract) <> ''
+        ON CONFLICT (attribute_name, option_key) DO NOTHING;
+
+        UPDATE organizations organization
+        SET hotline_contract_option_id = option.id
+        FROM organization_attribute_options option
+        WHERE option.attribute_name = 'hotline_contract'
+          AND option.option_key = btrim(organization.hotline_contract)
+          AND organization.hotline_contract_option_id IS NULL;
+
+        ALTER TABLE organizations DROP COLUMN hotline_contract;
+      END IF;
+    END $$;
+  `);
   await query("CREATE INDEX IF NOT EXISTS idx_organizations_name_lower ON organizations(lower(name));");
   await query("DROP INDEX IF EXISTS idx_organizations_active_name;");
 
@@ -257,6 +375,10 @@ export async function migrate() {
       organization_id BIGINT REFERENCES organizations(zammad_id),
       customer_name TEXT,
       work_type TEXT,
+      atoss_support BOOLEAN NOT NULL DEFAULT false,
+      teamspace_assignment_rule_id BIGINT REFERENCES teamspace_assignment_rules(id) ON DELETE SET NULL,
+      teamspace_assignment_project TEXT,
+      teamspace_assignment_synced_at TIMESTAMPTZ,
       created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
       CONSTRAINT ticket_number_format CHECK (ticket_number ~ '^Ticket#[0-9]{6}$'),
       CONSTRAINT ticket_work_type_valid CHECK (work_type IS NULL OR work_type IN ('support', 'consulting'))
@@ -267,6 +389,7 @@ export async function migrate() {
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS title TEXT;");
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS organization_id BIGINT REFERENCES organizations(zammad_id);");
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS work_type TEXT;");
+  await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS atoss_support BOOLEAN NOT NULL DEFAULT false;");
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS zammad_ticket_id BIGINT UNIQUE;");
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS zammad_group_id BIGINT;");
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS zammad_priority_id BIGINT;");
@@ -277,6 +400,9 @@ export async function migrate() {
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS zammad_merged_from_ticket_id BIGINT;");
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS zammad_merged_from_ticket_number TEXT;");
   await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS zammad_preferences JSONB NOT NULL DEFAULT '{}'::jsonb;");
+  await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS teamspace_assignment_rule_id BIGINT REFERENCES teamspace_assignment_rules(id) ON DELETE SET NULL;");
+  await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS teamspace_assignment_project TEXT;");
+  await query("ALTER TABLE tickets ADD COLUMN IF NOT EXISTS teamspace_assignment_synced_at TIMESTAMPTZ;");
   await query(`
     ALTER TABLE tickets
       DROP CONSTRAINT IF EXISTS ticket_number_format,
@@ -315,31 +441,6 @@ export async function migrate() {
     WHERE t.id = zto.id
       AND t.user_id IS DISTINCT FROM zto.user_id;
   `);
-  await query(`
-    UPDATE tickets t
-    SET user_id = owner.user_id
-    FROM (
-      SELECT ticket_id, MIN(user_id) AS user_id
-      FROM projects
-      GROUP BY ticket_id
-    ) owner
-    WHERE t.user_id IS NULL
-      AND t.zammad_owner_id IS NULL
-      AND t.id = owner.ticket_id;
-  `);
-  await query(`
-    UPDATE tickets t
-    SET user_id = owner.user_id
-    FROM (
-      SELECT ticket_id, MIN(user_id) AS user_id
-      FROM sessions
-      WHERE user_id IS NOT NULL
-      GROUP BY ticket_id
-    ) owner
-    WHERE t.user_id IS NULL
-      AND t.zammad_owner_id IS NULL
-      AND t.id = owner.ticket_id;
-  `);
   await query("CREATE INDEX IF NOT EXISTS idx_tickets_user ON tickets(user_id);");
   await query("CREATE INDEX IF NOT EXISTS idx_tickets_zammad_owner ON tickets(zammad_owner_id);");
 
@@ -375,6 +476,7 @@ export async function migrate() {
   await query("ALTER TABLE sessions ADD COLUMN IF NOT EXISTS recurring_occurrence_key TEXT;");
   await query("ALTER TABLE sessions ADD COLUMN IF NOT EXISTS project_teamspace_entry_id BIGINT;");
   await query("ALTER TABLE sessions ADD COLUMN IF NOT EXISTS activity_html TEXT;");
+  await query("ALTER TABLE sessions ADD COLUMN IF NOT EXISTS work_segments JSONB NOT NULL DEFAULT '[]'::jsonb;");
   await query(`
     CREATE TABLE IF NOT EXISTS active_timers (
       id BIGSERIAL PRIMARY KEY,
@@ -416,6 +518,7 @@ export async function migrate() {
   await query("ALTER TABLE active_timers ADD COLUMN IF NOT EXISTS paused_total_ms BIGINT NOT NULL DEFAULT 0;");
   await query("ALTER TABLE active_timers ADD COLUMN IF NOT EXISTS paused_at TIMESTAMPTZ;");
   await query("ALTER TABLE active_timers ADD COLUMN IF NOT EXISTS phase TEXT NOT NULL DEFAULT 'running';");
+  await query("ALTER TABLE active_timers ADD COLUMN IF NOT EXISTS work_segments JSONB NOT NULL DEFAULT '[]'::jsonb;");
   await query("ALTER TABLE active_timers ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ NOT NULL DEFAULT now();");
   await query("ALTER TABLE active_timers ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ NOT NULL DEFAULT now();");
   await query(`
@@ -877,6 +980,32 @@ export async function migrate() {
     END $$;
   `);
 
+  await query(`
+    UPDATE tickets t
+    SET user_id = owner.user_id
+    FROM (
+      SELECT ticket_id, MIN(user_id) AS user_id
+      FROM projects
+      GROUP BY ticket_id
+    ) owner
+    WHERE t.user_id IS NULL
+      AND t.zammad_owner_id IS NULL
+      AND t.id = owner.ticket_id;
+  `);
+  await query(`
+    UPDATE tickets t
+    SET user_id = owner.user_id
+    FROM (
+      SELECT ticket_id, MIN(user_id) AS user_id
+      FROM sessions
+      WHERE user_id IS NOT NULL
+      GROUP BY ticket_id
+    ) owner
+    WHERE t.user_id IS NULL
+      AND t.zammad_owner_id IS NULL
+      AND t.id = owner.ticket_id;
+  `);
+
   await query(`
     CREATE TABLE IF NOT EXISTS project_teamspace_entries (
       id BIGSERIAL PRIMARY KEY,
@@ -1120,6 +1249,37 @@ export async function migrate() {
   await query("CREATE INDEX IF NOT EXISTS idx_project_teamspace_subentries_entry_order ON project_teamspace_subentries(project_teamspace_entry_id, display_order, id);");
   await query("CREATE INDEX IF NOT EXISTS idx_project_teamspace_subentries_user_entry_order ON project_teamspace_subentries(user_id, project_teamspace_entry_id, display_order, id);");
   await query("CREATE UNIQUE INDEX IF NOT EXISTS idx_project_teamspace_subentries_user_entry_api ON project_teamspace_subentries(user_id, project_teamspace_entry_id, teamspace_api_project_id);");
+  await query(`
+    WITH exclusion_api_ids AS (
+      SELECT
+        tpe.teamspace_project,
+        MIN(api_id) AS main_api_id,
+        array_agg(DISTINCT api_id ORDER BY api_id) AS api_ids
+      FROM teamspace_project_exclusions tpe
+      CROSS JOIN LATERAL (
+        SELECT pte.teamspace_api_project_id AS api_id
+        FROM project_teamspace_entries pte
+        WHERE lower(btrim(pte.teamspace_project)) = lower(btrim(tpe.teamspace_project))
+          AND pte.teamspace_api_project_id IS NOT NULL
+
+        UNION
+
+        SELECT pts.teamspace_api_project_id AS api_id
+        FROM project_teamspace_entries pte
+        JOIN project_teamspace_subentries pts ON pts.project_teamspace_entry_id = pte.id
+        WHERE lower(btrim(pte.teamspace_project)) = lower(btrim(tpe.teamspace_project))
+      ) api_source
+      GROUP BY tpe.teamspace_project
+    )
+    UPDATE teamspace_project_exclusions tpe
+    SET teamspace_api_project_id = COALESCE(tpe.teamspace_api_project_id, exclusion_api_ids.main_api_id),
+        teamspace_api_project_ids = CASE
+          WHEN cardinality(tpe.teamspace_api_project_ids) = 0 THEN exclusion_api_ids.api_ids
+          ELSE tpe.teamspace_api_project_ids
+        END
+    FROM exclusion_api_ids
+    WHERE tpe.teamspace_project = exclusion_api_ids.teamspace_project;
+  `);
   await query(`
     WITH duplicate_keys AS (
       SELECT lower(btrim(teamspace_project)) AS teamspace_key
@@ -1561,7 +1721,7 @@ export async function migrate() {
           AND column_name = 'project_teamspace_subentry_id'
       ) THEN
         UPDATE sessions s
-        SET project_teamspace_entry_id = COALESCE(s.project_teamspace_entry_id, pts.project_teamspace_entry_id)
+        SET project_teamspace_entry_id = pts.project_teamspace_entry_id
         FROM project_teamspace_subentries pts
         WHERE s.project_teamspace_subentry_id = pts.id;
       END IF;
@@ -1685,7 +1845,15 @@ export async function migrate() {
     WHERE s.ticket_id = sep.ticket_id
       AND s.user_id = sep.user_id
       AND s.work_type = 'consulting'
-      AND s.project_teamspace_entry_id IS NULL;
+      AND (
+        s.project_teamspace_entry_id IS NULL
+        OR NOT EXISTS (
+          SELECT 1
+          FROM project_teamspace_entries current_pte
+          WHERE current_pte.id = s.project_teamspace_entry_id
+            AND current_pte.project_id = sep.project_id
+        )
+      );
   `);
 
   await query(`
@@ -1703,7 +1871,44 @@ export async function migrate() {
     FROM single_entry_tickets single_ticket
     WHERE s.ticket_id = single_ticket.ticket_id
       AND s.work_type = 'consulting'
-      AND s.project_teamspace_entry_id IS NULL;
+      AND (
+        s.project_teamspace_entry_id IS NULL
+        OR NOT EXISTS (
+          SELECT 1
+          FROM project_teamspace_entries current_pte
+          JOIN projects current_project ON current_project.id = current_pte.project_id
+          WHERE current_pte.id = s.project_teamspace_entry_id
+            AND current_project.ticket_id = single_ticket.ticket_id
+        )
+      );
+  `);
+
+  await query(`
+    WITH default_entry_tickets AS (
+      SELECT
+        p.ticket_id,
+        MIN(pte.id) AS project_teamspace_entry_id
+      FROM projects p
+      JOIN project_teamspace_entries pte ON pte.project_id = p.id
+      WHERE pte.is_default
+      GROUP BY p.ticket_id
+      HAVING COUNT(pte.id) = 1
+    )
+    UPDATE sessions s
+    SET project_teamspace_entry_id = default_ticket.project_teamspace_entry_id
+    FROM default_entry_tickets default_ticket
+    WHERE s.ticket_id = default_ticket.ticket_id
+      AND s.work_type = 'consulting'
+      AND (
+        s.project_teamspace_entry_id IS NULL
+        OR NOT EXISTS (
+          SELECT 1
+          FROM project_teamspace_entries current_pte
+          JOIN projects current_project ON current_project.id = current_pte.project_id
+          WHERE current_pte.id = s.project_teamspace_entry_id
+            AND current_project.ticket_id = default_ticket.ticket_id
+        )
+      );
   `);
 
   await query(`
@@ -1832,6 +2037,63 @@ export async function migrate() {
 
   await query("CREATE INDEX IF NOT EXISTS idx_recurring_billings_user_active ON recurring_billings(user_id, active);");
   await query("UPDATE recurring_billings SET active = true WHERE active = false;");
+  await query("ALTER TABLE recurring_billings ADD COLUMN IF NOT EXISTS teamspace_project TEXT;");
+  await query("ALTER TABLE recurring_billings ADD COLUMN IF NOT EXISTS hour_budget_minutes INTEGER;");
+  await query("ALTER TABLE recurring_billings ADD COLUMN IF NOT EXISTS manual_consumption_minutes INTEGER NOT NULL DEFAULT 0;");
+  await query(`
+    WITH existing_configuration AS (
+      SELECT DISTINCT ON (rb.id)
+        rb.id AS recurring_billing_id,
+        COALESCE(NULLIF(btrim(pte.teamspace_project), ''), NULLIF(btrim(p.teamspace_project), '')) AS teamspace_project,
+        COALESCE(pte.hour_budget_minutes, p.hour_budget_minutes) AS hour_budget_minutes,
+        GREATEST(
+          COALESCE(pte.manual_consumption_minutes, 0),
+          COALESCE(p.manual_consumption_minutes, 0)
+        )::int AS manual_consumption_minutes
+      FROM recurring_billings rb
+      JOIN tickets t ON t.ticket_number = COALESCE(rb.ticket_number, 'Fix#' || rb.id)
+      JOIN projects p
+        ON p.ticket_id = t.id
+       AND p.user_id = rb.user_id
+      LEFT JOIN project_teamspace_entries pte
+        ON pte.project_id = p.id
+       AND pte.is_default
+      ORDER BY rb.id, p.id ASC, pte.id ASC NULLS LAST
+    )
+    UPDATE recurring_billings rb
+    SET teamspace_project = COALESCE(rb.teamspace_project, existing.teamspace_project),
+        hour_budget_minutes = COALESCE(rb.hour_budget_minutes, existing.hour_budget_minutes),
+        manual_consumption_minutes = GREATEST(
+          rb.manual_consumption_minutes,
+          existing.manual_consumption_minutes
+        ),
+        updated_at = CASE
+          WHEN rb.teamspace_project IS NULL AND existing.teamspace_project IS NOT NULL
+            OR rb.hour_budget_minutes IS NULL AND existing.hour_budget_minutes IS NOT NULL
+            OR existing.manual_consumption_minutes > rb.manual_consumption_minutes
+          THEN now()
+          ELSE rb.updated_at
+        END
+    FROM existing_configuration existing
+    WHERE existing.recurring_billing_id = rb.id;
+  `);
+  await query(`
+    ALTER TABLE recurring_billings
+      DROP CONSTRAINT IF EXISTS recurring_billings_budget_non_negative,
+      ADD CONSTRAINT recurring_billings_budget_non_negative CHECK (hour_budget_minutes IS NULL OR hour_budget_minutes >= 0),
+      DROP CONSTRAINT IF EXISTS recurring_billings_manual_consumption_non_negative,
+      ADD CONSTRAINT recurring_billings_manual_consumption_non_negative CHECK (manual_consumption_minutes >= 0);
+  `);
+  await query(`
+    UPDATE tickets t
+    SET organization_id = rb.organization_id,
+        customer_name = o.name,
+        work_type = rb.work_type
+    FROM recurring_billings rb
+    JOIN organizations o ON o.zammad_id = rb.organization_id
+    WHERE t.ticket_number = COALESCE(rb.ticket_number, 'Fix#' || rb.id)
+      AND (t.user_id IS NULL OR t.user_id = rb.user_id);
+  `);
   await query(`
     WITH deleted_orphan_sessions AS (
       DELETE FROM sessions s
@@ -1889,6 +2151,7 @@ export async function migrate() {
   await query(`
     DELETE FROM tickets t
     WHERE t.ticket_number ~ '^Fix#[0-9]+$'
+      AND t.ticket_number <> 'Fix#0'
       AND NOT EXISTS (
         SELECT 1
         FROM sessions s
@@ -1916,4 +2179,49 @@ export async function migrate() {
     WHERE t.id = latest.ticket_id
       AND (t.customer_name IS NULL OR t.work_type IS NULL);
   `);
+
+  // Preserve an Atoss fallback that was already applied while the choice still
+  // lived on individual sessions. Rule-based assignments use the same
+  // technical Fix#0 container, so only sessions without a stored rule marker
+  // and on the configured, date-valid Atoss target qualify for this backfill.
+  await query(`
+    DO $$
+    BEGIN
+      IF NOT EXISTS (
+        SELECT 1
+        FROM app_settings
+        WHERE key = 'migration.atoss_support_ticket_backfill_v1'
+      ) THEN
+        UPDATE tickets ticket
+        SET atoss_support = true
+        WHERE ticket.work_type = 'support'
+          AND ticket.atoss_support = false
+          AND ticket.teamspace_assignment_rule_id IS NULL
+          AND EXISTS (
+            SELECT 1
+            FROM sessions session
+            JOIN project_teamspace_entries entry ON entry.id = session.project_teamspace_entry_id
+            JOIN projects target_project ON target_project.id = entry.project_id
+            JOIN tickets target_ticket ON target_ticket.id = target_project.ticket_id
+            JOIN teamspace_project_exclusions exclusion
+              ON lower(btrim(exclusion.teamspace_project)) = lower(btrim(entry.teamspace_project))
+            WHERE session.ticket_id = ticket.id
+              AND target_ticket.ticket_number = 'Fix#0'
+              AND exclusion.atoss_support_default = true
+              AND (
+                exclusion.atoss_support_valid_from IS NULL
+                OR exclusion.atoss_support_valid_from <= (session.started_at AT TIME ZONE 'Europe/Berlin')::date
+              )
+              AND (
+                exclusion.atoss_support_valid_to IS NULL
+                OR exclusion.atoss_support_valid_to >= (session.started_at AT TIME ZONE 'Europe/Berlin')::date
+              )
+          );
+
+        INSERT INTO app_settings (key, value, updated_at)
+        VALUES ('migration.atoss_support_ticket_backfill_v1', 'done', now());
+      END IF;
+    END $$;
+  `);
+
 }
diff --git a/backend/src/zammadOrganizationAttributes.ts b/backend/src/zammadOrganizationAttributes.ts
new file mode 100644
index 0000000..44b73dc
--- /dev/null
+++ b/backend/src/zammadOrganizationAttributes.ts
@@ -0,0 +1,71 @@
+export const organizationAttributeNames = ["customer_owner", "hotline_contract"] as const;
+
+export type OrganizationAttributeName = (typeof organizationAttributeNames)[number];
+
+export type ZammadOrganizationAttributeOption = {
+  zammadAttributeId: number;
+  attributeName: OrganizationAttributeName;
+  optionKey: string;
+  displayName: string;
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function isOrganizationAttributeName(value: unknown): value is OrganizationAttributeName {
+  return typeof value === "string" && organizationAttributeNames.includes(value as OrganizationAttributeName);
+}
+
+export function parseZammadOrganizationAttributeOptions(payload: unknown): ZammadOrganizationAttributeOption[] {
+  if (!Array.isArray(payload)) {
+    throw new Error("Zammad response must be an object-manager attribute array");
+  }
+
+  const options: ZammadOrganizationAttributeOption[] = [];
+  const foundAttributes = new Set<OrganizationAttributeName>();
+
+  for (const item of payload) {
+    if (!isRecord(item) || !isOrganizationAttributeName(item.name)) {
+      continue;
+    }
+
+    const zammadAttributeId = Number(item.id);
+    const dataOption = isRecord(item.data_option)
+      ? item.data_option
+      : isRecord(item.data_options)
+        ? item.data_options
+        : null;
+    const rawOptions = dataOption && isRecord(dataOption.options) ? dataOption.options : null;
+
+    if (!Number.isInteger(zammadAttributeId) || zammadAttributeId <= 0 || !rawOptions) {
+      throw new Error(`Zammad object-manager attribute ${item.name} is invalid`);
+    }
+
+    foundAttributes.add(item.name);
+
+    for (const [rawKey, rawDisplayName] of Object.entries(rawOptions)) {
+      const optionKey = rawKey.trim();
+      const displayName = typeof rawDisplayName === "string" ? rawDisplayName.trim() : "";
+
+      if (!optionKey || !displayName) {
+        continue;
+      }
+
+      options.push({
+        zammadAttributeId,
+        attributeName: item.name,
+        optionKey,
+        displayName
+      });
+    }
+  }
+
+  const missingAttributes = organizationAttributeNames.filter((name) => !foundAttributes.has(name));
+
+  if (missingAttributes.length > 0) {
+    throw new Error(`Zammad object-manager attributes missing: ${missingAttributes.join(", ")}`);
+  }
+
+  return options;
+}
diff --git a/backend/test/databaseExport.test.ts b/backend/test/databaseExport.test.ts
index b7778ba..06a7cda 100644
--- a/backend/test/databaseExport.test.ts
+++ b/backend/test/databaseExport.test.ts
@@ -1,9 +1,17 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import { nextSequenceIdAfterRestore, restoreSqlText, sequenceSetvalSql, sqlLiteral, type QueryExecutor } from "../src/databaseExport.ts";
-import { exportTableSql } from "../src/databaseExport.ts";
+import {
+  databaseExportTables,
+  exportTableSql,
+  nextSequenceIdAfterRestore,
+  restoreSqlText,
+  sequenceSetvalSql,
+  sqlLiteral,
+  type QueryExecutor
+} from "../src/databaseExport.ts";
 
 const jsonbColumn = { dataType: "jsonb", udtName: "jsonb" };
+const bigintArrayColumn = { dataType: "ARRAY", udtName: "_int8" };
 
 test("sqlLiteral serializes primitive values", () => {
   assert.equal(sqlLiteral(null), "NULL");
@@ -36,6 +44,20 @@ test("sqlLiteral serializes JSON columns as valid JSON values", () => {
   assert.equal(sqlLiteral(true, jsonbColumn), "'true'");
 });
 
+test("sqlLiteral serializes PostgreSQL arrays with an explicit element type", () => {
+  assert.equal(sqlLiteral([], bigintArrayColumn), "ARRAY[]::bigint[]");
+  assert.equal(sqlLiteral(["32349965", "32349982"], bigintArrayColumn), "ARRAY['32349965', '32349982']::bigint[]");
+  assert.throws(
+    () => sqlLiteral(["value"], { dataType: "ARRAY", udtName: "_unsupported" }),
+    /Unsupported PostgreSQL array type/
+  );
+});
+
+test("database export inserts assignment rules before tickets that reference them", () => {
+  assert.ok(databaseExportTables.indexOf("organization_attribute_options") < databaseExportTables.indexOf("teamspace_assignment_rules"));
+  assert.ok(databaseExportTables.indexOf("teamspace_assignment_rules") < databaseExportTables.indexOf("tickets"));
+});
+
 test("generated table export never contains implicit object stringification", async () => {
   const client: QueryExecutor = {
     async query<T extends Record<string, unknown>>(text: string): Promise<{ rows: T[]; rowCount: number | null }> {
diff --git a/backend/test/zammadOrganizationAttributes.test.ts b/backend/test/zammadOrganizationAttributes.test.ts
new file mode 100644
index 0000000..6110b10
--- /dev/null
+++ b/backend/test/zammadOrganizationAttributes.test.ts
@@ -0,0 +1,38 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { parseZammadOrganizationAttributeOptions } from "../src/zammadOrganizationAttributes.ts";
+
+test("parses the two organization select attributes and ignores unrelated attributes", () => {
+  const options = parseZammadOrganizationAttributeOptions([
+    {
+      id: 85,
+      name: "customer_owner",
+      data_option: { options: { ATOSS: "ATOSS", sdw: "SD Worx" } }
+    },
+    {
+      id: 12,
+      name: "unrelated",
+      data_option: { options: { no: "No" } }
+    },
+    {
+      id: 86,
+      name: "hotline_contract",
+      data_option: { options: { none: "(kein Hotlinevertrag)" } }
+    }
+  ]);
+
+  assert.deepEqual(options, [
+    { zammadAttributeId: 85, attributeName: "customer_owner", optionKey: "ATOSS", displayName: "ATOSS" },
+    { zammadAttributeId: 85, attributeName: "customer_owner", optionKey: "sdw", displayName: "SD Worx" },
+    { zammadAttributeId: 86, attributeName: "hotline_contract", optionKey: "none", displayName: "(kein Hotlinevertrag)" }
+  ]);
+});
+
+test("rejects responses without both required attributes", () => {
+  assert.throws(
+    () => parseZammadOrganizationAttributeOptions([
+      { id: 85, name: "customer_owner", data_option: { options: { ATOSS: "ATOSS" } } }
+    ]),
+    /hotline_contract/
+  );
+});
diff --git a/docs/confluence/01-zeiterfassung-sessions-monatsabschluss.md b/docs/confluence/01-zeiterfassung-sessions-monatsabschluss.md
index bae9381..3140b7b 100644
--- a/docs/confluence/01-zeiterfassung-sessions-monatsabschluss.md
+++ b/docs/confluence/01-zeiterfassung-sessions-monatsabschluss.md
@@ -73,12 +73,16 @@ Der Monatsabschluss ist die zentrale Kontrollseite für einen Benutzer und Monat
 
 Sie zeigt unter anderem:
 
-- offene Bewertungen
-- Sessions mit Zwischenstatus **Abrechenbar**
-- fehlende oder abweichende Teamspace-Werte, wenn Teamspace-Erfassung in TT aktiv ist
+- eine nach Ticket zusammengefuehrte Pruefliste
+- offene Bewertungen und Sessions mit Zwischenstatus **Abrechenbar**
+- fehlende oder abweichende Teamspace-Werte als farbige, spaltenweise ausgerichtete Badges; die Tagesdetails stehen am jeweiligen Tag im Ticketdetail
 - Prüfpunkte vor dem Abschluss
 - Möglichkeit, den Monat zu schließen oder wieder zu öffnen
 
+Jedes Ticket erscheint in der Pruefliste nur einmal. Monatsabweichungen, offene Bewertungen und betroffene Tage werden innerhalb dieses Eintrags gebuendelt; Hinweise zum gleichen Tag stehen in einer gemeinsamen Tageszeile.
+
+Ein TT-Teamspace-Tageswert ist nur konsistent, wenn fuer dasselbe Ticket und denselben Tag mindestens eine Session den Status **Abgerechnet** hat. Bei ausschliesslich abrechenbaren, nicht abrechenbaren oder unbewerteten Sessions wird der hinterlegte Wert als Fehler ausgewiesen; ein zusaetzlicher Unterschied zur TS-API bleibt ebenfalls sichtbar.
+
 Ein abgeschlossener Monat ist gegen versehentliche Änderungen geschützt. Wird eine Session in einem abgeschlossenen Zeitraum geändert, muss der Zeitraum vorher wieder geöffnet werden.
 
 ## Regeln bei deaktivierter Teamspace-Erfassung
diff --git a/docs/user-guide.md b/docs/user-guide.md
index ed8f609..70710c4 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -400,13 +400,14 @@ Einen separaten Tagesabschluss gibt es nicht. Die Tagesansicht ist nur eine gefi
 Die Seite `Monatsabschluss` enthaelt:
 
 - Checkliste
-- Offene Bewertungen
-- Tage ohne Teamspace-Wert
+- eine gemeinsame Pruefliste nach Ticket
 - Button zum Monat abschliessen oder wieder oeffnen
 
-Offene Bewertungen werden nach Ticket gruppiert. Mit `Ticket oeffnen` gelangt man direkt zur Bewertung.
+Die Pruefliste fuehrt offene Bewertungen, fehlende Teamspace-Tageswerte sowie Monats- und ticketgenaue Tagesabweichungen zusammen. Jedes Ticket erscheint nur einmal. Farbige Badges stehen in festen Spalten fuer die jeweilige Pruefart. Die zugehoerigen Tagesdetails mit TT-Teamspace-Wert, TS-API-Wert und Differenz werden im Ticketdetail am betroffenen Tag angezeigt. Mit `Ticket oeffnen` gelangt man direkt dorthin.
 
-Tage ohne Teamspace-Wert sind eine Pruefliste. Wenn ein Tag bewusst keinen Teamspace-Wert bekommen soll, kann der Eintrag mit `Zur Kenntnis` abgehakt werden.
+Wenn ein Tag bewusst keinen Teamspace-Wert bekommen soll, kann er innerhalb des Ticket-Eintrags mit `Zur Kenntnis` abgehakt werden. Trifft fuer denselben Tag zugleich eine TT/TS-Abweichung zu, werden beide Hinweise in einer gemeinsamen Tageszeile dargestellt.
+
+Ein hinterlegter TT-Teamspace-Wert setzt mindestens eine als `Abgerechnet` bewertete Session desselben Tickets und Tages voraus. Gibt es nur `Abrechenbar`, `Nicht abrechenbar` oder unbewertete Sessions, erscheint der Tageswert als Fehler. Der TT-Teamspace-Wert und eine eventuelle Abweichung zur TS-API werden trotzdem angezeigt.
 
 Zur Kenntnis genommene Eintraege koennen ueber die Checkbox `Zur Kenntnis anzeigen` wieder eingeblendet werden. Diese Anzeigeeinstellung bleibt im Browser gespeichert. Ein abgehakter Eintrag kann mit `Zuruecknehmen` wieder offen gemacht werden.
 
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 92769dc..afc2f66 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,5 +1,6 @@
 import {
   CalendarDays,
+  Building2,
   CheckCircle2,
   ClipboardCheck,
   Command,
@@ -87,8 +88,10 @@ import { isRecurringBillingTicketNumber, ticketHasRecurringBilling } from "./rec
 import { activeElapsedMs, mergeTimerActivityDrafts, readStoredTimers, storageKeyForUser, ticketPattern, type TimerEntry } from "./timers";
 import { formatTodoPeriod, isTodoActiveOnDay, isTodoFixedOnDay, isTodoOverdue } from "./todos";
 import { AdminUsersPage } from "./views/AdminUsersPage";
+import { AdminOrganizationsPage } from "./views/AdminOrganizationsPage";
 import { AnalysisPage } from "./views/AnalysisPage";
 import { DashboardPage } from "./views/DashboardPage";
+import { DashboardTimersPage } from "./views/DashboardTimersPage";
 import { FaqPage } from "./views/FaqPage";
 import { LoginPage } from "./views/LoginPage";
 import { MonthlyClosePage } from "./views/MonthlyClosePage";
@@ -225,6 +228,10 @@ function routeFromPath(pathWithSearch: string) {
   }
 
   if (pathname.startsWith("/dashboard")) {
+    if (pathname.startsWith("/dashboard/timers")) {
+      return { page: "dashboard-timers" as const };
+    }
+
     return { page: "dashboard" as const };
   }
 
@@ -260,6 +267,10 @@ function routeFromPath(pathWithSearch: string) {
     return { page: "admin-users" as const };
   }
 
+  if (pathname.startsWith("/admin/organizations")) {
+    return { page: "admin-organizations" as const };
+  }
+
   if (pathname.startsWith("/profile")) {
     return { page: "profile" as const };
   }
@@ -827,6 +838,7 @@ export function App() {
   const [timersLoaded, setTimersLoaded] = useState(false);
   const [timerOwnerId, setTimerOwnerId] = useState<string | null>(null);
   const [selectedTimerId, setSelectedTimerId] = useState<string | null>(null);
+  const [finishRequestTimerId, setFinishRequestTimerId] = useState<string | null>(null);
   const [tick, setTick] = useState(Date.now());
   const [openTickets, setOpenTickets] = useState<OpenTicketNavItem[]>([]);
   const [ticketReturnPaths, setTicketReturnPaths] = useState<Record<string, string>>({});
@@ -1160,7 +1172,7 @@ export function App() {
       return;
     }
 
-    if (route.page === "admin-users" || route.page === "profile" || route.page === "faq") {
+    if (route.page === "admin-users" || route.page === "admin-organizations" || route.page === "profile" || route.page === "faq") {
       return;
     }
 
@@ -1390,13 +1402,15 @@ export function App() {
     ...(currentUser.role === "admin"
       ? [
           { type: "item" as const, href: "/admin/users", label: "Administration", icon: Shield, active: path.startsWith("/admin/users") },
+          { type: "item" as const, href: "/admin/organizations", label: "Organisationen", icon: Building2, active: path.startsWith("/admin/organizations") },
           { type: "separator" as const, key: "before-profile" },
           { type: "item" as const, href: "/profile", label: "Profil", icon: UserCog, active: path.startsWith("/profile") },
           { type: "separator" as const, key: "before-faq" },
           { type: "item" as const, href: "/faq", label: "FAQ", icon: CircleHelp, active: path.startsWith("/faq") }
         ]
       : [
-          { type: "item" as const, href: "/dashboard", label: "Dashboard", icon: LayoutDashboard, active: path.startsWith("/dashboard") },
+          { type: "item" as const, href: "/dashboard", label: "Dashboard", icon: LayoutDashboard, active: path === "/dashboard" },
+          { type: "item" as const, href: "/dashboard/timers", label: "Timer-Übersicht", icon: Timer, active: path.startsWith("/dashboard/timers") },
           { type: "separator" as const, key: "after-dashboard" },
           { type: "item" as const, href: "/timer", label: "Session starten", icon: Timer, active: path.startsWith("/timer") || path === "/" },
           { type: "item" as const, href: "/analysis", label: "Ticket-Sessions", icon: Ticket, active: path.startsWith("/analysis") },
@@ -1567,7 +1581,7 @@ export function App() {
             <SidebarMenuItem>
               <SidebarMenuButton tooltip="Worklog">
                 <FolderGit />
-                <span className="text-xs text-muted-foreground">v1.1.0-rc1</span>
+                <span className="text-xs text-muted-foreground">v1.2.0-rc1</span>
               </SidebarMenuButton>
             </SidebarMenuItem>
           </SidebarMenu>
@@ -1662,9 +1676,27 @@ export function App() {
                 setSelectedTimerId={setSelectedTimerId}
                 tick={tick}
                 currentUser={currentUser}
+                finishRequestId={finishRequestTimerId}
+                onFinishRequestHandled={() => setFinishRequestTimerId(null)}
               />
             ) : null}
             {!isAdmin && route.page === "dashboard" ? <DashboardPage currentUser={currentUser} onNavigate={navigate} /> : null}
+            {!isAdmin && route.page === "dashboard-timers" ? (
+              <DashboardTimersPage
+                timers={timers}
+                setTimers={setTimers}
+                selectedTimerId={selectedTimerId}
+                setSelectedTimerId={setSelectedTimerId}
+                tick={tick}
+                currentUser={currentUser}
+                onFinishTimer={(timerId) => {
+                  setSelectedTimerId(timerId);
+                  setFinishRequestTimerId(timerId);
+                  navigate("/timer");
+                }}
+                onOpenActiveTimer={() => navigate("/timer")}
+              />
+            ) : null}
             {!isAdmin && route.page === "analysis" ? <AnalysisPage currentUser={currentUser} onNavigate={navigate} /> : null}
             {!isAdmin && route.page === "monthly-close" ? <MonthlyClosePage currentUser={currentUser} onNavigate={navigate} /> : null}
             {!isAdmin && route.page === "statistics" ? <StatisticsPage currentUser={currentUser} onNavigate={navigate} /> : null}
@@ -1675,6 +1707,7 @@ export function App() {
             {route.page === "faq" ? <FaqPage /> : null}
             {route.page === "profile" ? <ProfilePage currentUser={currentUser} onUserUpdated={setCurrentUser} /> : null}
             {route.page === "admin-users" && isAdmin ? <AdminUsersPage currentUser={currentUser} /> : null}
+            {route.page === "admin-organizations" && isAdmin ? <AdminOrganizationsPage /> : null}
             {route.page === "admin-users" && !isAdmin ? (
               <TimerPage
                 timers={timers}
@@ -1697,7 +1730,7 @@ export function App() {
                 returnPath={ticketReturnPaths[route.ticketId] ?? openTickets.find((ticket) => ticket.ticketId === route.ticketId)?.returnPath ?? "/analysis"}
               />
             ) : null}
-            {isAdmin && route.page !== "admin-users" && route.page !== "profile" && route.page !== "faq" ? <AdminUsersPage currentUser={currentUser} /> : null}
+            {isAdmin && route.page !== "admin-users" && route.page !== "admin-organizations" && route.page !== "profile" && route.page !== "faq" ? <AdminUsersPage currentUser={currentUser} /> : null}
           </div>
         </main>
       </SidebarInset>
diff --git a/frontend/src/api.ts b/frontend/src/api.ts
index 774bf4d..07c2240 100644
--- a/frontend/src/api.ts
+++ b/frontend/src/api.ts
@@ -19,6 +19,7 @@ import type {
   TodoPriority,
   TodoStatus,
   WorkType,
+  WorkSegment,
   ZammadSessionArticleQueueItem
 } from "./types";
 import type { TimerEntry, TimerPhase } from "./timers";
@@ -32,10 +33,12 @@ type CreateSessionPayload = {
   startedAt: string;
   endedAt: string;
   durationSeconds: number;
+  workSegments?: WorkSegment[];
   zammadLookup?: boolean;
   projectTeamspaceEntryId?: string | null;
   billingStatus?: BillingStatus;
   createZammadArticle?: boolean;
+  zammadArticleDateHeader?: boolean;
   zammadArticleTypeId?: number;
 };
 
@@ -330,8 +333,10 @@ export function updateCurrentUser(payload: {
   teamspaceDevicePassword?: string;
   zammadEmailSessionWebhookEnabled?: boolean;
   sessionBillingPromptEnabled?: boolean;
+  sessionWorkSegmentsEnabled?: boolean;
   teamspaceTimeTrackingEnabled?: boolean;
   zammadSessionNoteDefaultEnabled?: boolean;
+  zammadSessionNoteDateHeaderEnabled?: boolean;
   zammadTimeUnitRoundingEnabled?: boolean;
   zammadTimeUnitRoundingMinutes?: number;
   zammadAtossEmailSyncEnabled?: boolean;
@@ -436,6 +441,37 @@ export function updateAdminUser(
   });
 }
 
+export type TeamspaceInitialActualsSyncResult = {
+  userId: string;
+  fromMonth: string;
+  toMonth: string;
+  checkedEntries: number;
+  matchedEntries: number;
+  updatedProjectIds: number;
+  missingEntries: number;
+  ambiguousEntries: number;
+  monthsChecked: number;
+  monthsSkippedClosed: number;
+  teamspaceTimeEntriesScanned: number;
+  updatedManualEntries: number;
+  importedManualMinutes: number;
+  existingDayBillingMinutes: number;
+};
+
+export function syncAdminUserTeamspaceInitialActuals(userId: string, payload: { fromMonth?: string; toMonth?: string }) {
+  return request<{ result: TeamspaceInitialActualsSyncResult }>(`/api/admin/users/${userId}/teamspace-initial-actuals/sync`, {
+    method: "POST",
+    timeoutMs: 10 * 60 * 1000,
+    body: JSON.stringify(payload)
+  });
+}
+
+export function unlockAdminUserTeamspaceInitialActuals(userId: string) {
+  return request<{ user: AdminUser }>(`/api/admin/users/${userId}/teamspace-initial-actuals/unlock`, {
+    method: "POST"
+  });
+}
+
 export async function downloadDatabaseExport() {
   const response = await fetch("/api/admin/export/database", {
     credentials: "same-origin"
@@ -502,6 +538,33 @@ export function getOrganizations(search = "") {
   return request<{ organizations: Organization[] }>(`/api/organizations${params.size ? `?${params}` : ""}`);
 }
 
+export function getAdminOrganizations(options: {
+  search?: string;
+  page?: number;
+  pageSize?: number | "all";
+  missingAssignment?: boolean;
+} = {}) {
+  const params = new URLSearchParams();
+
+  if (options.search?.trim()) {
+    params.set("search", options.search.trim());
+  }
+
+  if (options.page) {
+    params.set("page", String(options.page));
+  }
+
+  if (options.pageSize) {
+    params.set("pageSize", String(options.pageSize));
+  }
+
+  if (options.missingAssignment) {
+    params.set("missingAssignment", "true");
+  }
+
+  return request<{ organizations: Organization[]; total: number; page: number; pageSize: number | "all" }>(`/api/admin/organizations${params.size ? `?${params}` : ""}`);
+}
+
 export function getZammadSettings() {
   return request<{ settings: { baseUrl: string; hasApiKey: boolean } }>("/api/admin/zammad/settings");
 }
@@ -526,16 +589,61 @@ export function saveTeamspaceSettings(payload: { baseUrl: string; credentialsUse
 
 export type TeamspaceProjectExclusion = {
   teamspace_project: string;
+  teamspace_api_project_id: string | null;
+  teamspace_api_project_ids: string[] | null;
   teamspace_name: string | null;
   customer_name: string | null;
+  atoss_support_default: boolean;
+  atoss_support_valid_from: string | null;
+  atoss_support_valid_to: string | null;
+  customer_owner_option_id: string | null;
+  hotline_contract_option_id: string | null;
   note: string;
 };
 
+export type OrganizationAttributeOption = {
+  id: string;
+  zammad_attribute_id: string;
+  attribute_name: "customer_owner" | "hotline_contract";
+  option_key: string;
+  display_name: string;
+  active: boolean;
+};
+
+export type TeamspaceAssignmentRule = {
+  id?: string;
+  name: string;
+  active: boolean;
+  priority: number;
+  customer_owner_option_id: string | null;
+  hotline_contract_option_id: string | null;
+  support_enabled: boolean;
+  consulting_enabled: boolean;
+  teamspace_project: string;
+  created_at?: string;
+  updated_at?: string;
+};
+
+export function getOrganizationAttributeOptions() {
+  return request<{ options: OrganizationAttributeOption[] }>("/api/admin/zammad/organization-attribute-options");
+}
+
+export function getTeamspaceAssignmentRules() {
+  return request<{ rules: TeamspaceAssignmentRule[] }>("/api/admin/teamspace/assignment-rules");
+}
+
+export function saveTeamspaceAssignmentRules(rules: TeamspaceAssignmentRule[]) {
+  return request<{ rules: TeamspaceAssignmentRule[] }>("/api/admin/teamspace/assignment-rules", {
+    method: "PUT",
+    body: JSON.stringify({ rules })
+  });
+}
+
 export function getTeamspaceProjectExclusions() {
   return request<{ exclusions: TeamspaceProjectExclusion[] }>("/api/admin/teamspace/project-exclusions");
 }
 
-export function saveTeamspaceProjectExclusions(projects: string[]) {
+export function saveTeamspaceProjectExclusions(projects: Array<Pick<TeamspaceProjectExclusion, "teamspace_project" | "atoss_support_default" | "atoss_support_valid_from" | "atoss_support_valid_to" | "customer_owner_option_id" | "hotline_contract_option_id">>) {
   return request<{ exclusions: TeamspaceProjectExclusion[] }>("/api/admin/teamspace/project-exclusions", {
     method: "PUT",
     body: JSON.stringify({ projects })
@@ -543,7 +651,7 @@ export function saveTeamspaceProjectExclusions(projects: string[]) {
 }
 
 export function syncZammadOrganizations(payload: { baseUrl?: string; apiKey?: string }) {
-  return request<{ synced: number; skipped: number; removed: number; unlinkedTickets: number; unlinkedSessions: number }>("/api/admin/zammad/organizations/sync", {
+  return request<{ synced: number; attributeOptions: number; skipped: number; removed: number; unlinkedTickets: number; unlinkedSessions: number }>("/api/admin/zammad/organizations/sync", {
     method: "POST",
     body: JSON.stringify(payload)
   });
@@ -712,6 +820,9 @@ export function createRecurringBilling(payload: {
   organizationId: string;
   activity: string;
   workType: WorkType;
+  teamspaceProject?: string | null;
+  hourBudgetMinutes?: number | null;
+  manualConsumptionMinutes?: number | null;
   recurrenceType: "weekly" | "every_n_weeks";
   intervalValue: number;
   validFrom: string;
@@ -737,6 +848,9 @@ export function updateRecurringBilling(
         organizationId: string;
         activity: string;
         workType: WorkType;
+        teamspaceProject?: string | null;
+        hourBudgetMinutes?: number | null;
+        manualConsumptionMinutes?: number | null;
         recurrenceType: "weekly" | "every_n_weeks";
         intervalValue: number;
         validFrom: string;
@@ -1008,6 +1122,13 @@ export function updateTicket(
   });
 }
 
+export function updateTicketAtossSupport(ticketId: string, atossSupport: boolean) {
+  return request<{ ticket: { atoss_support: boolean } }>(`/api/tickets/${ticketId}/atoss-support`, {
+    method: "PATCH",
+    body: JSON.stringify({ atossSupport })
+  });
+}
+
 export function updateSessionDetails(
   sessionId: string,
   payload: {
diff --git a/frontend/src/components/TodoPanel.tsx b/frontend/src/components/TodoPanel.tsx
index 78cf9da..1f30925 100644
--- a/frontend/src/components/TodoPanel.tsx
+++ b/frontend/src/components/TodoPanel.tsx
@@ -1,5 +1,5 @@
 import { CalendarDays, CheckCircle2, Circle, GripVertical, Pencil, Plus, Save, Trash2, X } from "lucide-react";
-import { FormEvent, useState } from "react";
+import { type FormEvent, type ReactNode, useState } from "react";
 import { toast } from "sonner";
 
 import { Badge } from "@/components/ui/badge";
@@ -40,9 +40,11 @@ type TodoPanelProps = {
   onNavigate?: (to: string) => void;
   reorderEnabled?: boolean;
   onReorder?: (draggedTodoId: string, targetTodoId: string) => void;
+  toolbar?: ReactNode;
+  compact?: boolean;
 };
 
-export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showTicketMeta = false, onNavigate, reorderEnabled = false, onReorder }: TodoPanelProps) {
+export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showTicketMeta = false, onNavigate, reorderEnabled = false, onReorder, toolbar, compact = false }: TodoPanelProps) {
   const [title, setTitle] = useState("");
   const [description, setDescription] = useState("");
   const [priority, setPriority] = useState<TodoPriority>("medium");
@@ -156,97 +158,100 @@ export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showT
   }
 
   return (
-    <div className="space-y-3">
-      {showCreate && ticketId ? (
-        <div className="flex justify-end">
-          <Dialog open={createOpen} onOpenChange={setCreateOpen}>
-            <DialogTrigger asChild>
-              <Button type="button" size="sm">
-                <Plus className="size-4" />
-                ToDo anlegen
-              </Button>
-            </DialogTrigger>
-            <DialogContent>
-              <DialogHeader>
-                <DialogTitle>ToDo anlegen</DialogTitle>
-                <DialogDescription>Neue Aufgabe zu diesem Ticket oder Projekt erfassen.</DialogDescription>
-              </DialogHeader>
-              <form className="space-y-4" onSubmit={submitTodo}>
-                <div className="space-y-2">
-                  <label className="text-sm font-medium" htmlFor={`todo-title-${ticketId}`}>
-                    Aufgabe
-                  </label>
-                  <Input id={`todo-title-${ticketId}`} value={title} onChange={(event) => setTitle(event.currentTarget.value)} autoFocus required />
-                </div>
-                <div className="space-y-2">
-                  <label className="text-sm font-medium" htmlFor={`todo-priority-${ticketId}`}>
-                    Priorität
-                  </label>
-                  <select
-                    id={`todo-priority-${ticketId}`}
-                    className="h-9 w-full rounded-lg border border-input bg-background px-2 text-sm focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
-                    value={priority}
-                    onChange={(event) => setPriority(event.currentTarget.value as TodoPriority)}
-                  >
-                    {Object.entries(priorityLabels).map(([value, label]) => (
-                      <option key={value} value={value}>
-                        {label}
-                      </option>
-                    ))}
-                  </select>
-                </div>
-                <div className="grid gap-3 sm:grid-cols-2">
+    <div className={compact ? "space-y-2" : "space-y-3"}>
+      {toolbar || (showCreate && ticketId) ? (
+        <div className={cn("flex flex-wrap items-center gap-2", toolbar ? "justify-start" : "justify-end")}>
+          <div className="min-w-0">{toolbar}</div>
+          {showCreate && ticketId ? (
+            <Dialog open={createOpen} onOpenChange={setCreateOpen}>
+              <DialogTrigger asChild>
+                <Button type="button" size="sm">
+                  <Plus className="size-4" />
+                  ToDo anlegen
+                </Button>
+              </DialogTrigger>
+              <DialogContent>
+                <DialogHeader>
+                  <DialogTitle>ToDo anlegen</DialogTitle>
+                  <DialogDescription>Neue Aufgabe zu diesem Ticket oder Projekt erfassen.</DialogDescription>
+                </DialogHeader>
+                <form className="space-y-4" onSubmit={submitTodo}>
                   <div className="space-y-2">
-                    <label className="text-sm font-medium" htmlFor={`todo-starts-on-${ticketId}`}>
-                      Umsetzung von
+                    <label className="text-sm font-medium" htmlFor={`todo-title-${ticketId}`}>
+                      Aufgabe
                     </label>
-                    <div className="flex gap-2">
-                      <Input id={`todo-starts-on-${ticketId}`} type="date" value={startsOn} onChange={(event) => setStartsOn(event.currentTarget.value)} />
-                      {startsOn ? (
-                        <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setStartsOn("")} aria-label="Von-Datum entfernen">
-                          <X className="size-4" />
-                        </Button>
-                      ) : null}
+                    <Input id={`todo-title-${ticketId}`} value={title} onChange={(event) => setTitle(event.currentTarget.value)} autoFocus required />
+                  </div>
+                  <div className="space-y-2">
+                    <label className="text-sm font-medium" htmlFor={`todo-priority-${ticketId}`}>
+                      Priorität
+                    </label>
+                    <select
+                      id={`todo-priority-${ticketId}`}
+                      className="h-9 w-full rounded-lg border border-input bg-background px-2 text-sm focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
+                      value={priority}
+                      onChange={(event) => setPriority(event.currentTarget.value as TodoPriority)}
+                    >
+                      {Object.entries(priorityLabels).map(([value, label]) => (
+                        <option key={value} value={value}>
+                          {label}
+                        </option>
+                      ))}
+                    </select>
+                  </div>
+                  <div className="grid gap-3 sm:grid-cols-2">
+                    <div className="space-y-2">
+                      <label className="text-sm font-medium" htmlFor={`todo-starts-on-${ticketId}`}>
+                        Umsetzung von
+                      </label>
+                      <div className="flex gap-2">
+                        <Input id={`todo-starts-on-${ticketId}`} type="date" value={startsOn} onChange={(event) => setStartsOn(event.currentTarget.value)} />
+                        {startsOn ? (
+                          <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setStartsOn("")} aria-label="Von-Datum entfernen">
+                            <X className="size-4" />
+                          </Button>
+                        ) : null}
+                      </div>
+                    </div>
+                    <div className="space-y-2">
+                      <label className="text-sm font-medium" htmlFor={`todo-ends-on-${ticketId}`}>
+                        Umsetzung bis
+                      </label>
+                      <div className="flex gap-2">
+                        <Input id={`todo-ends-on-${ticketId}`} type="date" value={endsOn} onChange={(event) => setEndsOn(event.currentTarget.value)} />
+                        {endsOn ? (
+                          <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setEndsOn("")} aria-label="Bis-Datum entfernen">
+                            <X className="size-4" />
+                          </Button>
+                        ) : null}
+                      </div>
                     </div>
                   </div>
                   <div className="space-y-2">
-                    <label className="text-sm font-medium" htmlFor={`todo-ends-on-${ticketId}`}>
-                      Umsetzung bis
+                    <label className="text-sm font-medium" htmlFor={`todo-description-${ticketId}`}>
+                      Details
                     </label>
-                    <div className="flex gap-2">
-                      <Input id={`todo-ends-on-${ticketId}`} type="date" value={endsOn} onChange={(event) => setEndsOn(event.currentTarget.value)} />
-                      {endsOn ? (
-                        <Button type="button" size="icon" variant="ghost" className="shrink-0" onClick={() => setEndsOn("")} aria-label="Bis-Datum entfernen">
-                          <X className="size-4" />
-                        </Button>
-                      ) : null}
-                    </div>
+                    <Textarea
+                      id={`todo-description-${ticketId}`}
+                      className="min-h-24"
+                      value={description}
+                      onChange={(event) => setDescription(event.currentTarget.value)}
+                    />
                   </div>
-                </div>
-                <div className="space-y-2">
-                  <label className="text-sm font-medium" htmlFor={`todo-description-${ticketId}`}>
-                    Details
-                  </label>
-                  <Textarea
-                    id={`todo-description-${ticketId}`}
-                    className="min-h-24"
-                    value={description}
-                    onChange={(event) => setDescription(event.currentTarget.value)}
-                  />
-                </div>
-                <div className="flex justify-end">
-                  <Button type="submit" disabled={saving}>
-                    <Plus className="size-4" />
-                    {saving ? "Speichert..." : "Anlegen"}
-                  </Button>
-                </div>
-              </form>
-            </DialogContent>
-          </Dialog>
+                  <div className="flex justify-end">
+                    <Button type="submit" disabled={saving}>
+                      <Plus className="size-4" />
+                      {saving ? "Speichert..." : "Anlegen"}
+                    </Button>
+                  </div>
+                </form>
+              </DialogContent>
+            </Dialog>
+          ) : null}
         </div>
       ) : null}
 
-      <div className="space-y-2">
+      <div className={compact ? "space-y-1.5" : "space-y-2"}>
         {todos.map((todo) => {
           const isEditing = editingId === todo.id;
           const periodLabel = formatTodoPeriod(todo);
@@ -256,7 +261,8 @@ export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showT
             <div
               key={todo.id}
               className={cn(
-                "rounded-md border bg-card/50 p-3 transition-colors",
+                "rounded-md border bg-card/50 transition-colors",
+                compact ? "p-2" : "p-3",
                 overdue && "border-red-500/50 bg-red-500/10",
                 todo.status === "done" && "opacity-70",
                 reorderEnabled && draggingId === todo.id && "border-primary/50 bg-primary/5"
@@ -393,7 +399,7 @@ export function TodoPanel({ ticketId, todos, onChanged, showCreate = true, showT
         })}
       </div>
 
-      {todos.length === 0 ? <p className="rounded-md border bg-muted/20 p-4 text-center text-sm text-muted-foreground">Keine ToDos vorhanden.</p> : null}
+      {todos.length === 0 ? <p className={cn("rounded-md border bg-muted/20 text-center text-sm text-muted-foreground", compact ? "p-3" : "p-4")}>Keine ToDos vorhanden.</p> : null}
     </div>
   );
 }
diff --git a/frontend/src/components/icons/ListClockIcon.tsx b/frontend/src/components/icons/ListClockIcon.tsx
new file mode 100644
index 0000000..f2a7a33
--- /dev/null
+++ b/frontend/src/components/icons/ListClockIcon.tsx
@@ -0,0 +1,16 @@
+import { Icon, type IconNode, type LucideProps } from "lucide-react";
+
+const listClockIconNode: IconNode = [
+  ["path", { d: "M3 6h.01", key: "1es8zl" }],
+  ["path", { d: "M3 12h.01", key: "1v72e3" }],
+  ["path", { d: "M3 18h.01", key: "1h3o6d" }],
+  ["path", { d: "M7 6h10", key: "1b9f9n" }],
+  ["path", { d: "M7 12h5", key: "1f8yah" }],
+  ["path", { d: "M7 18h3", key: "1ul03r" }],
+  ["circle", { cx: "17", cy: "17", r: "4", key: "y9qv7f" }],
+  ["path", { d: "M17 15v2l1.5 1.5", key: "d4d9bm" }]
+];
+
+export function ListClockIcon(props: LucideProps) {
+  return <Icon iconNode={listClockIconNode} {...props} />;
+}
diff --git a/frontend/src/help-content.ts b/frontend/src/help-content.ts
index 0814356..7d43aa7 100644
--- a/frontend/src/help-content.ts
+++ b/frontend/src/help-content.ts
@@ -158,12 +158,16 @@ export const helpSections: HelpSection[] = [
     quickItems: [
       "Ticketnummer, Organisation und Art sind bearbeitbar.",
       "Organisationen kommen aus der lokalen Zammad-Synchronisation.",
+      "Atoss Support ist ein bewusster Fallback am gesamten Support-Ticket.",
       "Die Art wiederkehrender Sessions kommt aus der Regel."
     ],
     details: [
       "Ticketnummern können korrigiert werden, falls beim Starten oder Nachtragen ein falscher Bezug gewählt wurde.",
       "Die Organisation wird immer über die Suchliste gewählt. Dadurch sind spätere Auswertungen pro Organisation zuverlässig.",
       "Änderungen an Organisation und Art werden auf vorhandene manuelle Sessions dieses Tickets übernommen.",
+      "Zammad-Verwaltung und automatische Teamspace-Zuordnungen werden kompakt als Badges in den Ticketdaten angezeigt.",
+      "Die automatische TS-Zuordnung prüft zuerst ein am Ticket hinterlegtes Projekt und danach die Zuordnungsregeln aus dem Adminbereich. Der Haken Atoss Support greift nur, wenn beides fehlt.",
+      "Die Auswahl Atoss Support wird nur bei Support-Tickets ohne Projekt- oder Regelzuordnung angezeigt. Ist sie aktiviert, werden alle Sessions des Tickets anhand ihres Datums dem dafür im Adminbereich gültigen Atoss-Support-Projekt zugewiesen. Ohne Haken bleibt das Ticket bewusst unzugeordnet und muss manuell geprüft werden.",
       "Bei wiederkehrenden Sessions ist die Art nicht direkt an der Session änderbar. Sie wird ausschließlich über die fixe Abrechnungsregel gesteuert.",
       "Wenn ein Ticket bereits durch einen anderen Benutzer bekannt ist, können dessen Ticketdaten beim Beenden eines Timers übernommen werden. Die Session selbst bleibt trotzdem deinem Benutzer zugeordnet."
     ]
@@ -341,7 +345,9 @@ export const helpSections: HelpSection[] = [
     description: "Der Monatsabschluss ist die Kontrollseite für offene Bewertungen und Teamspace-Punkte vor dem Abschluss.",
     quickItems: [
       "Bewertungen sind Pflicht für den Abschluss.",
-      "Tage ohne Teamspace-Wert können zur Kenntnis genommen werden.",
+      "Alle Prüfpunkte werden pro Ticket in einem Eintrag zusammengeführt.",
+      "Tage ohne Teamspace-Wert können innerhalb des Tickets zur Kenntnis genommen werden.",
+      "Support und ausgenommene Consulting-Projekte werden über Ticket#XXXXXX pro Tag mit der TS-API abgeglichen.",
       "Der Monat kann wieder geöffnet werden."
     ],
     details: [
@@ -351,7 +357,11 @@ export const helpSections: HelpSection[] = [
       "Zur Kenntnis genommene Einträge können über die Checkbox Zur Kenntnis anzeigen wieder eingeblendet werden.",
       "Die Kenntnisnahme kann pro Eintrag über Zurücknehmen rückgängig gemacht werden.",
       "Die Einstellung, ob zur Kenntnis genommene Einträge angezeigt werden, bleibt im Browser gespeichert.",
-      "Offene Bewertungen werden nach Ticket gruppiert. Ein Klick auf Ticket öffnen führt zur Bewertung im Ticket.",
+      "Die Prüfliste führt offene Bewertungen, fehlende Teamspace-Tageswerte sowie Monats- und Tagesabweichungen nach Ticket zusammen. Dadurch erscheint jedes Ticket nur einmal.",
+      "Die Ticketzeile zeigt die Prüfarten als farbige Badges in festen Spalten. Die betroffenen Tage mit TT-Teamspace-Wert, TS-API-Wert und Differenz stehen direkt im Ticketdetail. Ein Klick auf Ticket öffnen führt dorthin.",
+      "Ein hinterlegter TT-Teamspace-Wert ist nur gültig, wenn es an diesem Ticket-Tag mindestens eine als Abgerechnet bewertete Session gibt. Andernfalls zeigt die Prüfliste einen Fehler und nennt zusätzlich vorhandene abrechenbare, nicht abrechenbare oder unbewertete Sessions.",
+      "Der ticketgenaue TS-Abgleich erkennt Teamspace-Unterpositionen, deren Bezeichnung mit Ticket#XXXXXX beginnt. Er vergleicht deren API-Tageswerte mit den in TicketTracker gepflegten Teamspace-Zeiten an den Session-Tagen desselben Tickets.",
+      "Der ticketgenaue Abgleich gilt für Support-Tickets und für Consulting-Tickets auf einem in der Administration ausgenommenen Teamspace-Projekt. Angezeigt werden sowohl fehlende Zeit in Teamspace als auch fehlende Zeit in TicketTracker.",
       "Es gibt keinen Tagesabschluss. Tagesansichten dienen nur der Kontrolle."
     ]
   },
@@ -561,6 +571,10 @@ export const helpSections: HelpSection[] = [
       "Admins können bestehende Benutzer bearbeiten, Passwörter setzen und Benutzer deaktivieren.",
       "Der feste Admin-Zugang kann nicht deaktiviert oder zur normalen User-Rolle herabgestuft werden.",
       "Der Data-Sync speichert Zammad-Zugangsdaten und synchronisiert Organisationen in die lokale Datenbank.",
+      "Beim Organisationsabgleich werden zuerst die Zammad-Auswahloptionen für Zugeordnet und Hotline synchronisiert. In den globalen Teamspace-Projektausnahmen können diese Optionen anschließend pro Projekt ausgewählt werden.",
+      "Automatische TS-Zuordnungsregeln kombinieren optional Zugeordnet und Hotline mit Support und/oder Consulting sowie einem Zielprojekt. Sind beide Attribute gesetzt, müssen beide passen; bei mehreren Treffern gewinnt die kleinste Priorität.",
+      "Beim Zammad-Sync gilt die Reihenfolge: Ein konkretes TS-Projekt hat Vorrang. Genau ein Projekt wird allen Sessions automatisch zugeordnet; bei mehreren Projekten erfolgt die Auswahl beim Speichern einer Session manuell. Nur ohne konkretes Projekt wird eine passende Regel angewendet und allen Sessions des Tickets zugeordnet.",
+      "Die im Sync ermittelte Regelzuordnung wird im Ticketdetail angezeigt. Greift keine Regel, bleibt das Ticket ohne automatische TS-Zuordnung.",
       "Der Zammad-Ticket-Sync aktualisiert Titel, Organisation, Typ, Zammad-Status, Zammad-Priorität sowie Teamspace-Projekte und Budgets je nach gewählter Option.",
       "Zammad-Projektwerte können mehrere Teamspace-IDs enthalten. TicketTracker erkennt zusammenhängende IDs und legt entsprechend mehrere Teamspace-Einträge an.",
       "Beim Budget-Sync bleiben geschützte TicketTracker-Budgets unverändert. Die Option Budget-Schutz im Sync ignorieren überschreibt auch geschützte Budgets mit Zammad-Werten.",
diff --git a/frontend/src/timers.ts b/frontend/src/timers.ts
index c115a83..bb5625b 100644
--- a/frontend/src/timers.ts
+++ b/frontend/src/timers.ts
@@ -1,4 +1,4 @@
-import type { BillingStatus } from "./types";
+import type { BillingStatus, WorkSegment } from "./types";
 
 export type TimerPhase = "running" | "paused";
 
@@ -16,6 +16,7 @@ export type TimerEntry = {
   startedAt: number;
   pausedTotalMs: number;
   pausedAt: number | null;
+  workSegments?: WorkSegment[];
   phase: TimerPhase;
 };
 
@@ -58,6 +59,34 @@ export function resumeEntry(timer: TimerEntry, now = Date.now()): TimerEntry {
   };
 }
 
+function normalizeWorkSegments(value: unknown): WorkSegment[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  return value
+    .map((segment) => {
+      if (!segment || typeof segment !== "object") {
+        return null;
+      }
+
+      const raw = segment as Partial<WorkSegment>;
+      if (typeof raw.startedAt !== "string" || Number.isNaN(new Date(raw.startedAt).getTime())) {
+        return null;
+      }
+
+      if (raw.endedAt !== null && raw.endedAt !== undefined && (typeof raw.endedAt !== "string" || Number.isNaN(new Date(raw.endedAt).getTime()))) {
+        return null;
+      }
+
+      return {
+        startedAt: new Date(raw.startedAt).toISOString(),
+        endedAt: raw.endedAt ? new Date(raw.endedAt).toISOString() : null,
+      };
+    })
+    .filter((segment): segment is WorkSegment => Boolean(segment));
+}
+
 export function normalizeTimers(timers: TimerEntry[]) {
   let runningSeen = false;
   const now = Date.now();
@@ -70,6 +99,7 @@ export function normalizeTimers(timers: TimerEntry[]) {
         activity: typeof timer.activity === "string" ? timer.activity : "",
         zammadArticleBody: typeof timer.zammadArticleBody === "string" ? timer.zammadArticleBody : "",
         billingStatus: timer.billingStatus === "billed" ? "billable" : timer.billingStatus === "billable" || timer.billingStatus === "non_billable" ? timer.billingStatus : null,
+        workSegments: normalizeWorkSegments(timer.workSegments),
       };
 
       if (timer.phase !== "running") {
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index fc90207..dcf36df 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -16,8 +16,10 @@ export type AuthUser = {
   has_teamspace_credentials: boolean;
   zammad_email_session_webhook_enabled: boolean;
   session_billing_prompt_enabled: boolean;
+  session_work_segments_enabled: boolean;
   teamspace_time_tracking_enabled: boolean;
   zammad_session_note_default_enabled: boolean;
+  zammad_session_note_date_header_enabled: boolean;
   zammad_time_unit_rounding_enabled: boolean;
   zammad_time_unit_rounding_minutes: number;
   zammad_atoss_email_sync_enabled: boolean;
@@ -73,10 +75,19 @@ export type DashboardDayTicket = {
 };
 
 export type AdminUser = AuthUser & {
+  teamspace_initial_actuals_synced_at: string | null;
+  teamspace_initial_actuals_synced_by: string | null;
+  teamspace_initial_actuals_unlocked_at: string | null;
+  teamspace_initial_actuals_unlocked_by: string | null;
   created_at: string;
   updated_at: string;
 };
 
+export type WorkSegment = {
+  startedAt: string;
+  endedAt: string | null;
+};
+
 export type ZammadSessionArticleQueueItem = {
   id: string;
   session_id: string;
@@ -98,7 +109,15 @@ export type Organization = {
   id: string;
   zammad_id: string;
   name: string;
+  customer_owner_option_id?: string | null;
+  customer_owner?: string | null;
+  customer_owner_display_name?: string | null;
+  hotline_contract_option_id?: string | null;
+  hotline_contract?: string | null;
+  hotline_contract_display_name?: string | null;
   synced_at: string;
+  created_at?: string;
+  updated_at?: string;
 };
 
 export type RecurringBillingSlot = {
@@ -119,6 +138,9 @@ export type RecurringBilling = {
   organization_name: string;
   activity: string;
   work_type: WorkType;
+  teamspace_project: string | null;
+  hour_budget_minutes: number | null;
+  manual_consumption_minutes: number;
   recurrence_type: "weekly" | "every_n_weeks";
   interval_value: number;
   valid_from: string;
@@ -138,6 +160,12 @@ export type TicketMeta = {
   organization_name: string | null;
   customer_name: string | null;
   work_type: WorkType | null;
+  atoss_support?: boolean;
+  can_manage_atoss_support?: boolean;
+  teamspace_assignment_rule_id?: string | null;
+  teamspace_assignment_rule_name?: string | null;
+  teamspace_assignment_project?: string | null;
+  teamspace_assignment_synced_at?: string | null;
   zammad_ticket_id?: string | null;
   zammad_group_id?: string | null;
   zammad_priority_id?: string | null;
@@ -333,7 +361,11 @@ export type TeamspaceMonthActual = {
 export type TeamspaceMonthActualPosition = {
   apiProjectId: string;
   projectId: string | null;
+  mainProjectId?: string | null;
   label: string;
+  description?: string | null;
+  ticketNumber?: string | null;
+  customerName?: string | null;
   isSubentry: boolean;
   billingType?: string | null;
   minutes: number;
@@ -398,6 +430,27 @@ export type TicketDayBilling = {
   billed_minutes: number;
 };
 
+export type TicketTeamspaceDay = {
+  day: string;
+  tracked_minutes: number;
+  crm_billed_minutes: number;
+  teamspace_entry_count: number;
+  delta_minutes: number;
+  session_count: number;
+  billed_session_count: number;
+  billable_session_count: number;
+  non_billable_session_count: number;
+  unrated_session_count: number;
+  has_tt_value: boolean;
+  missing_tt_value: boolean;
+  tt_value_without_billed_session: boolean;
+  acknowledged: boolean;
+  acknowledged_at: string | null;
+  comparison_enabled: boolean;
+  teamspace_excluded: boolean;
+  work_type: WorkType | null;
+};
+
 export type TicketAvailableMonth = {
   month: string;
   session_count: number;
@@ -417,6 +470,7 @@ export type SessionEntry = {
   ended_at: string;
   duration_seconds: number;
   rounded_minutes: number;
+  work_segments: WorkSegment[];
   billing_status: BillingStatus;
   billing_updated_at: string | null;
   created_at: string;
@@ -448,6 +502,12 @@ export type TicketPeriod = {
     organization_name: string | null;
     customer_name: string | null;
     work_type: WorkType | null;
+    atoss_support?: boolean;
+    can_manage_atoss_support?: boolean;
+    teamspace_assignment_rule_id?: string | null;
+    teamspace_assignment_rule_name?: string | null;
+    teamspace_assignment_project?: string | null;
+    teamspace_assignment_synced_at?: string | null;
     zammad_ticket_id?: string | null;
     zammad_group_id?: string | null;
     zammad_priority_id?: string | null;
@@ -466,6 +526,7 @@ export type TicketPeriod = {
   };
   sessions: SessionEntry[];
   dayBillings: TicketDayBilling[];
+  ticketTeamspaceDays?: TicketTeamspaceDay[];
   project?: ProjectSummary | null;
   todos?: TicketTodo[];
   teamspaceMonthActuals?: TeamspaceMonthActual[];
@@ -562,15 +623,25 @@ export type StatisticsCrmDay = {
 };
 
 export type StatisticsTeamspaceDay = {
-  ticket_id: string;
-  ticket_number: string;
+  ticket_id: string | null;
+  ticket_number: string | null;
   organization_name: string;
   day: string;
   tracked_minutes: number;
   crm_billed_minutes: number;
+  teamspace_entry_count: number;
   delta_minutes: number;
   session_count: number;
   project_teamspace_project: string | null;
+  api_project_id?: string | null;
+  teamspace_project_id?: string | null;
+  teamspace_excluded?: boolean;
+  work_type?: WorkType | null;
+  tt_value_without_billed_session?: boolean;
+  billed_session_count?: number;
+  billable_session_count?: number;
+  non_billable_session_count?: number;
+  unrated_session_count?: number;
 };
 
 export type StatisticsTeamspaceMonthMismatch = {
@@ -651,6 +722,7 @@ export type StatisticsOverview = {
     acknowledgedMissingCrmDays: StatisticsCrmDay[];
     crmMismatches: StatisticsCrmDay[];
     teamspaceMonthMismatches: StatisticsTeamspaceMonthMismatch[];
+    ticketTeamspaceMismatches: StatisticsTeamspaceDay[];
   };
   teamspaceDays: StatisticsTeamspaceDay[];
 };
diff --git a/frontend/src/views/AdminOrganizationsPage.tsx b/frontend/src/views/AdminOrganizationsPage.tsx
new file mode 100644
index 0000000..5a6668f
--- /dev/null
+++ b/frontend/src/views/AdminOrganizationsPage.tsx
@@ -0,0 +1,330 @@
+import { FormEvent, useEffect, useMemo, useRef, useState } from "react";
+import { Building2, DatabaseZap, RefreshCcw, Save, Search } from "lucide-react";
+import { toast } from "sonner";
+
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { Checkbox } from "@/components/ui/checkbox";
+import { Input } from "@/components/ui/input";
+import { NativeSelect, NativeSelectOption } from "@/components/ui/native-select";
+import { Pagination, PaginationContent, PaginationItem, PaginationNext, PaginationPrevious } from "@/components/ui/pagination";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+import { HelpLink } from "@/components/HelpLink";
+import { getAdminOrganizations, getZammadSettings, saveZammadSettings, syncZammadOrganizations } from "../api";
+import { formatDateTime } from "../format";
+import type { Organization } from "../types";
+
+type PageSize = 10 | 20 | 50 | 100 | "all";
+
+const pageSizeOptions: PageSize[] = [10, 20, 50, 100, "all"];
+
+function pageSizeFromValue(value: string): PageSize {
+  if (value === "all") {
+    return "all";
+  }
+
+  const parsed = Number(value);
+  return pageSizeOptions.includes(parsed as PageSize) ? parsed as PageSize : 20;
+}
+
+function emptyText(value: string | null | undefined) {
+  return value?.trim() || "leer";
+}
+
+export function AdminOrganizationsPage() {
+  const [organizations, setOrganizations] = useState<Organization[]>([]);
+  const [total, setTotal] = useState(0);
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState<PageSize>(20);
+  const [search, setSearch] = useState("");
+  const [missingAssignment, setMissingAssignment] = useState(false);
+  const [zammadBaseUrl, setZammadBaseUrl] = useState("");
+  const [zammadApiKey, setZammadApiKey] = useState("");
+  const [hasZammadApiKey, setHasZammadApiKey] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [savingZammadSettings, setSavingZammadSettings] = useState(false);
+  const [syncingOrganizations, setSyncingOrganizations] = useState(false);
+  const loadRequestId = useRef(0);
+
+  const pageCount = pageSize === "all" ? 1 : Math.max(1, Math.ceil(total / pageSize));
+  const safePage = Math.min(page, pageCount);
+  const rangeStart = total === 0 ? 0 : pageSize === "all" ? 1 : (safePage - 1) * pageSize + 1;
+  const rangeEnd = pageSize === "all" ? total : Math.min(safePage * pageSize, total);
+  const activeFilterCount = useMemo(
+    () => [search.trim(), missingAssignment].filter(Boolean).length,
+    [missingAssignment, search]
+  );
+
+  async function loadSettings() {
+    const result = await getZammadSettings();
+    setZammadBaseUrl(result.settings.baseUrl);
+    setHasZammadApiKey(result.settings.hasApiKey);
+  }
+
+  async function loadOrganizations() {
+    const requestId = loadRequestId.current + 1;
+    loadRequestId.current = requestId;
+    setLoading(true);
+
+    try {
+      const result = await getAdminOrganizations({
+        search,
+        page: safePage,
+        pageSize,
+        missingAssignment
+      });
+
+      if (requestId === loadRequestId.current) {
+        setOrganizations(result.organizations);
+        setTotal(result.total);
+      }
+    } catch (error) {
+      if (requestId === loadRequestId.current) {
+        toast.error("Organisationen konnten nicht geladen werden", {
+          description: error instanceof Error ? error.message : "Unbekannter Fehler"
+        });
+      }
+    } finally {
+      if (requestId === loadRequestId.current) {
+        setLoading(false);
+      }
+    }
+  }
+
+  useEffect(() => {
+    void loadSettings();
+  }, []);
+
+  useEffect(() => {
+    setPage(1);
+  }, [search, pageSize, missingAssignment]);
+
+  useEffect(() => {
+    void loadOrganizations();
+  }, [safePage, pageSize, search, missingAssignment]);
+
+  async function saveZammadAccess() {
+    setSavingZammadSettings(true);
+
+    try {
+      const result = await saveZammadSettings({
+        baseUrl: zammadBaseUrl,
+        apiKey: zammadApiKey.trim() || undefined
+      });
+      setZammadBaseUrl(result.settings.baseUrl);
+      setHasZammadApiKey(result.settings.hasApiKey);
+      setZammadApiKey("");
+      toast.success("Zammad-Zugang gespeichert", {
+        description: result.settings.hasApiKey ? "URL und API-Key sind hinterlegt." : "URL wurde gespeichert."
+      });
+    } catch (error) {
+      toast.error("Zammad-Zugang konnte nicht gespeichert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSavingZammadSettings(false);
+    }
+  }
+
+  async function syncOrganizations(event: FormEvent) {
+    event.preventDefault();
+    setSyncingOrganizations(true);
+
+    try {
+      const result = await syncZammadOrganizations({
+        baseUrl: zammadBaseUrl,
+        apiKey: zammadApiKey.trim() || undefined
+      });
+      toast.success("Organisationen synchronisiert", {
+        description: `${result.attributeOptions} Attributoptionen und ${result.synced} Organisationen gespeichert, ${result.removed} Organisationen entfernt, ${result.unlinkedTickets + result.unlinkedSessions} Verknüpfung(en) gelöst.`
+      });
+      setHasZammadApiKey(true);
+      setZammadApiKey("");
+      await loadOrganizations();
+    } catch (error) {
+      toast.error("Zammad-Sync fehlgeschlagen", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSyncingOrganizations(false);
+    }
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex flex-col gap-3 lg:flex-row lg:items-end lg:justify-between">
+        <div>
+          <h2 className="text-xl font-semibold tracking-normal sm:text-2xl">Organisationsabgleich</h2>
+          <p className="text-sm text-muted-foreground">Zammad-Organisationen synchronisieren, prüfen und nach fehlenden Zuordnungen filtern.</p>
+        </div>
+        <Badge variant={activeFilterCount > 0 ? "secondary" : "outline"}>{activeFilterCount} Filter aktiv</Badge>
+      </div>
+
+      <Card>
+        <CardHeader className="gap-3 p-4 sm:flex-row sm:items-start sm:justify-between sm:space-y-0">
+          <div>
+            <CardTitle>Zammad-Sync</CardTitle>
+            <CardDescription>Zugang speichern und Organisationen aus Zammad in die lokale Datenbank übernehmen.</CardDescription>
+          </div>
+          <HelpLink anchor="organisationen" label="Hilfe zum Organisationsabgleich" />
+        </CardHeader>
+        <CardContent className="px-4 pb-4">
+          <form className="grid gap-3 lg:grid-cols-[minmax(220px,1fr)_minmax(220px,1fr)_auto_auto] lg:items-end" onSubmit={syncOrganizations}>
+            <div className="space-y-2">
+              <label className="text-sm font-medium" htmlFor="zammad-base-url">Zammad URL</label>
+              <Input
+                id="zammad-base-url"
+                placeholder="https://zammad.example.de"
+                value={zammadBaseUrl}
+                onChange={(event) => setZammadBaseUrl(event.currentTarget.value)}
+                required
+              />
+            </div>
+            <div className="space-y-2">
+              <label className="text-sm font-medium" htmlFor="zammad-api-key">API-Key</label>
+              <Input
+                id="zammad-api-key"
+                type="password"
+                placeholder={hasZammadApiKey ? "••••••••••••••••" : ""}
+                value={zammadApiKey}
+                onChange={(event) => setZammadApiKey(event.currentTarget.value)}
+              />
+            </div>
+            <Button type="button" variant="secondary" disabled={savingZammadSettings} onClick={() => void saveZammadAccess()}>
+              <Save className="size-4" />
+              {savingZammadSettings ? "Speichert..." : "Zugang speichern"}
+            </Button>
+            <Button type="submit" disabled={syncingOrganizations}>
+              <DatabaseZap className="size-4" />
+              {syncingOrganizations ? "Synchronisiert..." : "Synchronisieren"}
+            </Button>
+          </form>
+        </CardContent>
+      </Card>
+
+      <Card>
+        <CardHeader className="gap-3 p-4 xl:flex-row xl:items-end xl:justify-between xl:space-y-0">
+          <div>
+            <CardTitle>Organisationen</CardTitle>
+            <CardDescription>{loading ? "Lädt..." : `${rangeStart}-${rangeEnd} von ${total} Organisation(en)`}</CardDescription>
+          </div>
+          <div className="grid gap-2 md:grid-cols-[minmax(220px,1fr)_auto_auto] md:items-end">
+            <div className="space-y-1">
+              <label className="text-xs font-medium text-muted-foreground" htmlFor="organization-search">Suche</label>
+              <div className="relative">
+                <Search className="pointer-events-none absolute left-2.5 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" />
+                <Input
+                  id="organization-search"
+                  className="pl-8"
+                  placeholder="Name, ID, Zuordnung, Hotline..."
+                  value={search}
+                  onChange={(event) => setSearch(event.currentTarget.value)}
+                />
+              </div>
+            </div>
+            <label className="flex h-9 items-center gap-2 rounded-md border bg-background px-3 text-sm">
+              <Checkbox checked={missingAssignment} onCheckedChange={(checked) => setMissingAssignment(checked === true)} />
+              Zuordnung fehlt
+            </label>
+            <div className="space-y-1">
+              <label className="text-xs font-medium text-muted-foreground" htmlFor="organization-page-size">Anzeigen</label>
+              <NativeSelect
+                id="organization-page-size"
+                className="w-28"
+                value={String(pageSize)}
+                onChange={(event) => setPageSize(pageSizeFromValue(event.currentTarget.value))}
+              >
+                {pageSizeOptions.map((option) => (
+                  <NativeSelectOption key={String(option)} value={String(option)}>
+                    {option === "all" ? "Alle" : option}
+                  </NativeSelectOption>
+                ))}
+              </NativeSelect>
+            </div>
+          </div>
+        </CardHeader>
+        <CardContent className="space-y-3 px-4 pb-4">
+          <div className="overflow-x-auto rounded-md border">
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead className="min-w-20">Zammad-ID</TableHead>
+                  <TableHead className="min-w-[260px]">Organisation</TableHead>
+                  <TableHead className="min-w-[180px]">Zugeordnet</TableHead>
+                  <TableHead className="min-w-[160px]">Hotline</TableHead>
+                  <TableHead className="min-w-[150px]">Synchronisiert</TableHead>
+                  <TableHead className="min-w-[150px]">Geändert</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {organizations.map((organization) => (
+                  <TableRow key={organization.zammad_id}>
+                    <TableCell className="font-mono text-xs">{organization.zammad_id}</TableCell>
+                    <TableCell>
+                      <div className="flex min-w-0 items-center gap-2">
+                        <Building2 className="size-4 shrink-0 text-muted-foreground" />
+                        <span className="truncate font-medium">{organization.name}</span>
+                      </div>
+                    </TableCell>
+                    <TableCell className={organization.customer_owner ? "" : "text-muted-foreground"}>{emptyText(organization.customer_owner)}</TableCell>
+                    <TableCell className={organization.hotline_contract ? "" : "text-muted-foreground"}>{emptyText(organization.hotline_contract)}</TableCell>
+                    <TableCell className="text-xs text-muted-foreground">{formatDateTime(organization.synced_at)}</TableCell>
+                    <TableCell className="text-xs text-muted-foreground">{organization.updated_at ? formatDateTime(organization.updated_at) : "-"}</TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+            {organizations.length === 0 ? (
+              <div className="grid place-items-center gap-2 px-4 py-10 text-center text-sm text-muted-foreground">
+                <Building2 className="size-8" />
+                Keine Organisationen für die aktuellen Filter.
+              </div>
+            ) : null}
+          </div>
+
+          {pageSize !== "all" ? (
+            <Pagination className="justify-end">
+              <PaginationContent>
+                <PaginationItem>
+                  <PaginationPrevious
+                    href="#"
+                    text="Zurück"
+                    aria-disabled={safePage <= 1}
+                    className={safePage <= 1 ? "pointer-events-none opacity-50" : undefined}
+                    onClick={(event) => {
+                      event.preventDefault();
+                      setPage((current) => Math.max(1, current - 1));
+                    }}
+                  />
+                </PaginationItem>
+                <PaginationItem>
+                  <span className="flex h-9 items-center px-3 text-sm text-muted-foreground">
+                    Seite {safePage} von {pageCount}
+                  </span>
+                </PaginationItem>
+                <PaginationItem>
+                  <PaginationNext
+                    href="#"
+                    text="Weiter"
+                    aria-disabled={safePage >= pageCount}
+                    className={safePage >= pageCount ? "pointer-events-none opacity-50" : undefined}
+                    onClick={(event) => {
+                      event.preventDefault();
+                      setPage((current) => Math.min(pageCount, current + 1));
+                    }}
+                  />
+                </PaginationItem>
+              </PaginationContent>
+            </Pagination>
+          ) : null}
+
+          <Button type="button" variant="secondary" size="sm" disabled={loading} onClick={() => void loadOrganizations()}>
+            <RefreshCcw className="size-4" />
+            Aktualisieren
+          </Button>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/frontend/src/views/AdminUsersPage.tsx b/frontend/src/views/AdminUsersPage.tsx
index 05971af..ab94670 100644
--- a/frontend/src/views/AdminUsersPage.tsx
+++ b/frontend/src/views/AdminUsersPage.tsx
@@ -1,5 +1,5 @@
 import { ChangeEvent, FormEvent, useEffect, useState } from "react";
-import { CheckCircle2, DatabaseBackup, DatabaseZap, Plus, Save, Shield, Trash2, Unplug, Upload, UserPlus } from "lucide-react";
+import { CheckCircle2, DatabaseBackup, Plus, RotateCcw, Save, Shield, TimerReset, Trash2, Unplug, Upload, UserPlus } from "lucide-react";
 import { toast } from "sonner";
 
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
@@ -14,17 +14,21 @@ import {
   createAdminUser,
   downloadDatabaseExport,
   getAdminUsers,
+  getOrganizationAttributeOptions,
+  getTeamspaceAssignmentRules,
   getTeamspaceSettings,
   getTeamspaceProjectExclusions,
-  getZammadSettings,
   restoreDatabaseBackup,
-  saveZammadSettings,
   saveTeamspaceSettings,
+  saveTeamspaceAssignmentRules,
   saveTeamspaceProjectExclusions,
-  syncZammadOrganizations,
+  syncAdminUserTeamspaceInitialActuals,
+  unlockAdminUserTeamspaceInitialActuals,
   updateAdminUser,
   validateDatabaseBackup,
   type TeamspaceProjectExclusion,
+  type TeamspaceAssignmentRule,
+  type OrganizationAttributeOption,
   type RestoreValidationResult
 } from "../api";
 import type { AdminUser, AuthUser } from "../types";
@@ -56,17 +60,15 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
   const [users, setUsers] = useState<AdminUser[]>([]);
   const [forms, setForms] = useState<Record<string, UserFormState>>({});
   const [newUser, setNewUser] = useState<UserFormState>(emptyForm);
-  const [zammadBaseUrl, setZammadBaseUrl] = useState("");
-  const [zammadApiKey, setZammadApiKey] = useState("");
-  const [hasZammadApiKey, setHasZammadApiKey] = useState(false);
   const [teamspaceBaseUrl, setTeamspaceBaseUrl] = useState("");
   const [teamspaceCredentialsUserId, setTeamspaceCredentialsUserId] = useState("");
   const [teamspaceProjectExclusions, setTeamspaceProjectExclusions] = useState<TeamspaceProjectExclusion[]>([]);
+  const [organizationAttributeOptions, setOrganizationAttributeOptions] = useState<OrganizationAttributeOption[]>([]);
+  const [teamspaceAssignmentRules, setTeamspaceAssignmentRules] = useState<TeamspaceAssignmentRule[]>([]);
   const [newTeamspaceProjectExclusion, setNewTeamspaceProjectExclusion] = useState("");
-  const [syncingOrganizations, setSyncingOrganizations] = useState(false);
-  const [savingZammadSettings, setSavingZammadSettings] = useState(false);
   const [savingTeamspaceSettings, setSavingTeamspaceSettings] = useState(false);
   const [savingTeamspaceProjectExclusions, setSavingTeamspaceProjectExclusions] = useState(false);
+  const [savingTeamspaceAssignmentRules, setSavingTeamspaceAssignmentRules] = useState(false);
   const [exportingDatabase, setExportingDatabase] = useState(false);
   const [restoreSql, setRestoreSql] = useState("");
   const [restoreValidation, setRestoreValidation] = useState<RestoreValidationResult | null>(null);
@@ -74,25 +76,29 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
   const [restoringDatabase, setRestoringDatabase] = useState(false);
   const [loading, setLoading] = useState(false);
   const [savingId, setSavingId] = useState<string | null>(null);
+  const [syncingInitialActualsId, setSyncingInitialActualsId] = useState<string | null>(null);
+  const [unlockingInitialActualsId, setUnlockingInitialActualsId] = useState<string | null>(null);
+  const [initialActualsFromMonthByUser, setInitialActualsFromMonthByUser] = useState<Record<string, string>>({});
   const [creating, setCreating] = useState(false);
 
   async function load(options: { preserveEdits?: boolean } = {}) {
     setLoading(true);
     try {
-      const [usersResult, zammadSettingsResult, teamspaceSettingsResult, teamspaceProjectExclusionsResult] = await Promise.all([
+      const [usersResult, teamspaceSettingsResult, teamspaceProjectExclusionsResult, organizationAttributeOptionsResult, teamspaceAssignmentRulesResult] = await Promise.all([
         getAdminUsers(),
-        getZammadSettings(),
         getTeamspaceSettings(),
-        getTeamspaceProjectExclusions()
+        getTeamspaceProjectExclusions(),
+        getOrganizationAttributeOptions(),
+        getTeamspaceAssignmentRules()
       ]);
       setUsers(usersResult.users);
 
       if (!options.preserveEdits) {
-        setZammadBaseUrl(zammadSettingsResult.settings.baseUrl);
-        setHasZammadApiKey(zammadSettingsResult.settings.hasApiKey);
         setTeamspaceBaseUrl(teamspaceSettingsResult.settings.baseUrl);
         setTeamspaceCredentialsUserId(teamspaceSettingsResult.settings.credentialsUserId ?? "");
         setTeamspaceProjectExclusions(teamspaceProjectExclusionsResult.exclusions);
+        setOrganizationAttributeOptions(organizationAttributeOptionsResult.options);
+        setTeamspaceAssignmentRules(teamspaceAssignmentRulesResult.rules);
       }
 
       setForms((current) =>
@@ -185,49 +191,64 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
     }
   }
 
-  async function syncOrganizations(event: FormEvent) {
-    event.preventDefault();
-    setSyncingOrganizations(true);
+  function initialActualsLocked(user: AdminUser) {
+    return Boolean(
+      user.teamspace_initial_actuals_synced_at &&
+      (!user.teamspace_initial_actuals_unlocked_at || user.teamspace_initial_actuals_unlocked_at <= user.teamspace_initial_actuals_synced_at)
+    );
+  }
 
+  function initialActualsStatus(user: AdminUser) {
+    if (initialActualsLocked(user)) {
+      return `ausgeführt ${new Date(user.teamspace_initial_actuals_synced_at as string).toLocaleDateString("de-DE")}`;
+    }
+
+    if (user.teamspace_initial_actuals_unlocked_at) {
+      return "entsperrt";
+    }
+
+    return "bereit";
+  }
+
+  async function syncInitialActuals(user: AdminUser) {
+    if (!window.confirm(`Teamspace-Istzeiten für ${user.display_name} initial als manuelle TS-Zeiten übernehmen? Vorhandene Tageswerte bleiben unverändert.`)) {
+      return;
+    }
+
+    setSyncingInitialActualsId(user.id);
     try {
-      const result = await syncZammadOrganizations({
-        baseUrl: zammadBaseUrl,
-        apiKey: zammadApiKey.trim() || undefined
+      const result = await syncAdminUserTeamspaceInitialActuals(user.id, {
+        fromMonth: initialActualsFromMonthByUser[user.id] || undefined
       });
-      toast.success("Organisationen synchronisiert", {
-        description: `${result.synced} gespeichert, ${result.removed} entfernt, ${result.unlinkedTickets + result.unlinkedSessions} Verknüpfung(en) gelöst.`
+      toast.success("TS-Istzeiten übernommen", {
+        description: `${result.result.updatedManualEntries} TS-Eintrag(e), ${Math.round(result.result.importedManualMinutes / 60 * 100) / 100} Std., Zeitraum ${result.result.fromMonth} bis ${result.result.toMonth}.`
       });
-      setHasZammadApiKey(true);
-      setZammadApiKey("");
+      await load();
     } catch (error) {
-      toast.error("Zammad-Sync fehlgeschlagen", {
+      toast.error("TS-Istzeiten konnten nicht übernommen werden", {
         description: error instanceof Error ? error.message : "Unbekannter Fehler"
       });
     } finally {
-      setSyncingOrganizations(false);
+      setSyncingInitialActualsId(null);
     }
   }
 
-  async function saveZammadAccess() {
-    setSavingZammadSettings(true);
+  async function unlockInitialActuals(user: AdminUser) {
+    if (!window.confirm(`Initialen Teamspace-Istzeiten-Sync für ${user.display_name} wieder freigeben?`)) {
+      return;
+    }
 
+    setUnlockingInitialActualsId(user.id);
     try {
-      const result = await saveZammadSettings({
-        baseUrl: zammadBaseUrl,
-        apiKey: zammadApiKey.trim() || undefined
-      });
-      setZammadBaseUrl(result.settings.baseUrl);
-      setHasZammadApiKey(result.settings.hasApiKey);
-      setZammadApiKey("");
-      toast.success("Zammad-Zugang gespeichert", {
-        description: result.settings.hasApiKey ? "URL und API-Key sind hinterlegt." : "URL wurde gespeichert."
-      });
+      await unlockAdminUserTeamspaceInitialActuals(user.id);
+      toast.success("Initialsync entsperrt");
+      await load({ preserveEdits: true });
     } catch (error) {
-      toast.error("Zammad-Zugang konnte nicht gespeichert werden", {
+      toast.error("Initialsync konnte nicht entsperrt werden", {
         description: error instanceof Error ? error.message : "Unbekannter Fehler"
       });
     } finally {
-      setSavingZammadSettings(false);
+      setUnlockingInitialActualsId(null);
     }
   }
 
@@ -274,6 +295,13 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
         teamspace_project: project,
         teamspace_name: null,
         customer_name: null,
+        teamspace_api_project_id: null,
+        teamspace_api_project_ids: [],
+        atoss_support_default: false,
+        atoss_support_valid_from: null,
+        atoss_support_valid_to: null,
+        customer_owner_option_id: null,
+        hotline_contract_option_id: null,
         note: ""
       }
     ]);
@@ -284,11 +312,26 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
     setTeamspaceProjectExclusions((current) => current.filter((entry) => entry.teamspace_project !== project));
   }
 
+  function updateTeamspaceExclusion(project: string, patch: Partial<TeamspaceProjectExclusion>) {
+    setTeamspaceProjectExclusions((current) =>
+      current.map((entry) => entry.teamspace_project === project ? { ...entry, ...patch } : entry)
+    );
+  }
+
   async function saveTeamspaceExclusions() {
     setSavingTeamspaceProjectExclusions(true);
 
     try {
-      const projects = teamspaceProjectExclusions.map((entry) => entry.teamspace_project.trim()).filter(Boolean);
+      const projects = teamspaceProjectExclusions
+        .map((entry) => ({
+          teamspace_project: entry.teamspace_project.trim(),
+          atoss_support_default: entry.atoss_support_default,
+          atoss_support_valid_from: entry.atoss_support_valid_from || null,
+          atoss_support_valid_to: entry.atoss_support_valid_to || null,
+          customer_owner_option_id: entry.customer_owner_option_id || null,
+          hotline_contract_option_id: entry.hotline_contract_option_id || null
+        }))
+        .filter((entry) => entry.teamspace_project);
       const result = await saveTeamspaceProjectExclusions(projects);
       setTeamspaceProjectExclusions(result.exclusions);
       toast.success("Teamspace-Ausnahmen gespeichert", {
@@ -303,6 +346,59 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
     }
   }
 
+  function addTeamspaceAssignmentRule() {
+    const highestPriority = teamspaceAssignmentRules.reduce((highest, rule) => Math.max(highest, rule.priority), 0);
+    const defaultTarget = teamspaceProjectExclusions[0] ?? null;
+    setTeamspaceAssignmentRules((current) => [
+      ...current,
+      {
+        name: `Regel ${current.length + 1}`,
+        active: true,
+        priority: highestPriority + 10,
+        customer_owner_option_id: defaultTarget?.customer_owner_option_id ?? null,
+        hotline_contract_option_id: defaultTarget?.hotline_contract_option_id ?? null,
+        support_enabled: true,
+        consulting_enabled: false,
+        teamspace_project: defaultTarget?.teamspace_project ?? ""
+      }
+    ]);
+  }
+
+  function updateTeamspaceAssignmentRule(index: number, patch: Partial<TeamspaceAssignmentRule>) {
+    setTeamspaceAssignmentRules((current) => current.map((rule, currentIndex) => currentIndex === index ? { ...rule, ...patch } : rule));
+  }
+
+  function removeTeamspaceAssignmentRule(index: number) {
+    setTeamspaceAssignmentRules((current) => current.filter((_, currentIndex) => currentIndex !== index));
+  }
+
+  function updateTeamspaceAssignmentRuleTarget(index: number, teamspaceProject: string) {
+    const target = teamspaceProjectExclusions.find((entry) => entry.teamspace_project === teamspaceProject);
+    updateTeamspaceAssignmentRule(index, {
+      teamspace_project: teamspaceProject,
+      customer_owner_option_id: target?.customer_owner_option_id ?? null,
+      hotline_contract_option_id: target?.hotline_contract_option_id ?? null
+    });
+  }
+
+  async function saveAssignmentRules() {
+    setSavingTeamspaceAssignmentRules(true);
+
+    try {
+      const result = await saveTeamspaceAssignmentRules(teamspaceAssignmentRules);
+      setTeamspaceAssignmentRules(result.rules);
+      toast.success("Automatische Zuordnungsregeln gespeichert", {
+        description: `${result.rules.length} Regel(n) gespeichert. Kleinere Prioritätswerte werden zuerst geprüft.`
+      });
+    } catch (error) {
+      toast.error("Zuordnungsregeln konnten nicht gespeichert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSavingTeamspaceAssignmentRules(false);
+    }
+  }
+
   async function exportDatabase() {
     setExportingDatabase(true);
 
@@ -408,6 +504,16 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
   }
 
   const regularUserCount = users.filter((user) => user.role === "user").length;
+  const customerOwnerOptions = organizationAttributeOptions.filter((option) => option.attribute_name === "customer_owner");
+  const hotlineContractOptions = organizationAttributeOptions.filter((option) => option.attribute_name === "hotline_contract");
+
+  function organizationAttributeOptionLabel(option: OrganizationAttributeOption) {
+    const label = option.display_name === option.option_key
+      ? option.display_name
+      : `${option.display_name} (${option.option_key})`;
+
+    return option.active ? label : `${label} · nicht mehr in Zammad`;
+  }
 
   return (
     <div className="space-y-4">
@@ -416,56 +522,20 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
         <p className="text-sm text-muted-foreground">Systemverwaltung für Benutzer, Zammad-Organisationen und restore-fähige Backups.</p>
       </div>
 
-      <div className="grid min-w-0 gap-4 2xl:grid-cols-[minmax(0,1.2fr)_minmax(340px,0.8fr)]">
+      <div className="grid min-w-0 gap-4">
         <Card className="min-w-0">
           <CardHeader className="p-4">
             <div className="flex items-start justify-between gap-3">
               <div className="flex items-center gap-2">
-                <DatabaseZap className="size-5 text-muted-foreground" />
-                <CardTitle>Data-Sync</CardTitle>
+                <Unplug className="size-5 text-muted-foreground" />
+                <CardTitle>Teamspace API</CardTitle>
               </div>
-              <HelpLink anchor="organisationen" label="Hilfe zum Zammad-Sync" />
+              <HelpLink anchor="admin" label="Hilfe zu Teamspace API" />
             </div>
-            <CardDescription>Zammad-Zugang speichern und Organisationen in die lokale TicketTracker-Datenbank übernehmen.</CardDescription>
+            <CardDescription>Teamspace-Zugang für Adminabfragen und globale Projekt-Ausnahmen verwalten.</CardDescription>
           </CardHeader>
           <CardContent className="px-4 pb-4">
-            <form className="grid gap-3 xl:grid-cols-2" onSubmit={syncOrganizations}>
-              <div className="space-y-2">
-                <label className="text-sm font-medium" htmlFor="zammad-base-url">Zammad URL</label>
-                <Input
-                  id="zammad-base-url"
-                  placeholder="https://zammad.example.de"
-                  value={zammadBaseUrl}
-                  onChange={(event) => setZammadBaseUrl(event.currentTarget.value)}
-                  required
-                />
-              </div>
-              <div className="space-y-2">
-                <label className="text-sm font-medium" htmlFor="zammad-api-key">API-Key</label>
-                <Input
-                  id="zammad-api-key"
-                  type="password"
-                  placeholder={hasZammadApiKey ? "••••••••••••••••" : ""}
-                  value={zammadApiKey}
-                  onChange={(event) => setZammadApiKey(event.currentTarget.value)}
-                />
-              </div>
-              <div className="flex flex-wrap gap-2 xl:col-span-2">
-                <Button type="button" variant="secondary" disabled={savingZammadSettings} onClick={() => void saveZammadAccess()}>
-                  <Save className="size-4" />
-                  {savingZammadSettings ? "Speichert..." : "Zugang speichern"}
-                </Button>
-                <Button type="submit" disabled={syncingOrganizations}>
-                  <DatabaseZap className="size-4" />
-                  {syncingOrganizations ? "Synchronisiert..." : "Organisationen synchronisieren"}
-                </Button>
-              </div>
-            </form>
-            <div className="mt-4 border-t pt-4">
-              <div className="mb-3 flex items-center gap-2">
-                <Unplug className="size-4 text-muted-foreground" />
-                <p className="text-sm font-medium">Teamspace API</p>
-              </div>
+            <div className="space-y-4">
               <div className="grid gap-3 xl:grid-cols-[minmax(220px,1fr)_minmax(220px,1fr)_auto] xl:items-end">
                 <div className="space-y-2">
                   <label className="text-sm font-medium" htmlFor="teamspace-base-url">Teamspace URL</label>
@@ -502,7 +572,7 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                 <div>
                   <p className="text-sm font-medium">TS-Projekte ohne Differenz-/Budgetprüfung</p>
                   <p className="text-xs text-muted-foreground">
-                    Sync und Gesamtverbrauch laufen weiter, aber TS/TT-Differenzen, Budgetbalken und Budgetverbrauch werden für diese TS-Projekte ausgeblendet. Beim Speichern werden Name und Kunde aus Teamspace geladen.
+                    Sync und Gesamtverbrauch laufen weiter, aber TS/TT-Differenzen, Budgetbalken und Budgetverbrauch werden für diese TS-Projekte ausgeblendet. Zugeordnet und Hotline stammen aus den Zammad-Organisationsattributen.
                   </p>
                 </div>
                 <div className="flex flex-col gap-2 sm:flex-row">
@@ -523,22 +593,54 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                     Hinzufügen
                   </Button>
                 </div>
-                <div className="overflow-hidden rounded-md border bg-background">
+                <div className="overflow-x-auto rounded-md border bg-background">
                   {teamspaceProjectExclusions.length === 0 ? (
                     <p className="px-3 py-4 text-sm text-muted-foreground">Noch keine Teamspace-Projekte ausgenommen.</p>
                   ) : (
-                    <div className="divide-y">
+                    <div className="min-w-[1120px] divide-y">
                       {teamspaceProjectExclusions.map((entry) => (
-                        <div key={entry.teamspace_project} className="grid gap-2 px-3 py-2 sm:grid-cols-[140px_minmax(0,1fr)_minmax(0,1fr)_auto] sm:items-center">
+                        <div key={entry.teamspace_project} className="grid grid-cols-[180px_minmax(280px,1fr)_minmax(240px,0.9fr)_210px_210px_2.5rem] items-center gap-4 px-4 py-3">
                           <div className="font-mono text-sm font-semibold">{entry.teamspace_project}</div>
                           <div className="min-w-0">
-                            <p className="truncate text-sm">{entry.teamspace_name ?? "Name wird beim Speichern aus Teamspace geladen"}</p>
-                            <p className="text-xs text-muted-foreground sm:hidden">{entry.customer_name ?? "Kunde wird beim Speichern aus Teamspace geladen"}</p>
+                            <p className="truncate text-sm font-medium">{entry.teamspace_name ?? "Name wird beim Speichern aus Teamspace geladen"}</p>
+                            {entry.teamspace_api_project_ids?.length ? <p className="text-xs text-muted-foreground">{entry.teamspace_api_project_ids.length} API-ID(s)</p> : null}
                           </div>
-                          <div className="hidden min-w-0 text-sm text-muted-foreground sm:block">
-                            <span className="truncate">{entry.customer_name ?? "Kunde wird beim Speichern aus Teamspace geladen"}</span>
+                          <div className="min-w-0 text-sm text-muted-foreground">
+                            <p className="truncate">{entry.customer_name ?? "Kunde wird beim Speichern aus Teamspace geladen"}</p>
                           </div>
-                          <Button type="button" variant="ghost" size="icon" className="justify-self-start sm:justify-self-end" onClick={() => removeTeamspaceExclusion(entry.teamspace_project)}>
+                          <div className="space-y-1">
+                            <label className="text-xs text-muted-foreground" htmlFor={`customer-owner-${entry.teamspace_project}`}>Zugeordnet</label>
+                            <select
+                              id={`customer-owner-${entry.teamspace_project}`}
+                              className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                              value={entry.customer_owner_option_id ?? ""}
+                              onChange={(event) => updateTeamspaceExclusion(entry.teamspace_project, { customer_owner_option_id: event.currentTarget.value || null })}
+                            >
+                              <option value="">Nicht zugeordnet</option>
+                              {customerOwnerOptions.map((option) => (
+                                <option key={option.id} value={option.id} disabled={!option.active && option.id !== entry.customer_owner_option_id}>
+                                  {organizationAttributeOptionLabel(option)}
+                                </option>
+                              ))}
+                            </select>
+                          </div>
+                          <div className="space-y-1">
+                            <label className="text-xs text-muted-foreground" htmlFor={`hotline-contract-${entry.teamspace_project}`}>Hotline</label>
+                            <select
+                              id={`hotline-contract-${entry.teamspace_project}`}
+                              className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                              value={entry.hotline_contract_option_id ?? ""}
+                              onChange={(event) => updateTeamspaceExclusion(entry.teamspace_project, { hotline_contract_option_id: event.currentTarget.value || null })}
+                            >
+                              <option value="">Nicht zugeordnet</option>
+                              {hotlineContractOptions.map((option) => (
+                                <option key={option.id} value={option.id} disabled={!option.active && option.id !== entry.hotline_contract_option_id}>
+                                  {organizationAttributeOptionLabel(option)}
+                                </option>
+                              ))}
+                            </select>
+                          </div>
+                          <Button type="button" variant="ghost" size="icon" className="justify-self-end" onClick={() => removeTeamspaceExclusion(entry.teamspace_project)}>
                             <Trash2 className="size-4" />
                             <span className="sr-only">Teamspace-Projekt entfernen</span>
                           </Button>
@@ -552,6 +654,135 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                   {savingTeamspaceProjectExclusions ? "Speichert..." : "Ausnahmen speichern"}
                 </Button>
               </div>
+              <div className="space-y-3 rounded-md border bg-muted/20 p-3">
+                <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
+                  <div>
+                    <p className="text-sm font-medium">Automatische TS-Zuordnung</p>
+                    <p className="text-xs text-muted-foreground">
+                      Angegebene Bedingungen innerhalb einer Regel gelten gemeinsam. Beim Auswählen des Zielprojekts werden dessen hinterlegte Zugeordnet-/Hotline-Werte übernommen und können danach angepasst werden. Die erste passende aktive Regel gewinnt. Regeln werden beim Zammad-Sync nur angewendet, wenn das Ticket keine konkrete TS-Projektnummer besitzt; anschließend werden alle Sessions dem Zielprojekt zugeordnet.
+                    </p>
+                  </div>
+                  <Button type="button" variant="secondary" onClick={addTeamspaceAssignmentRule}>
+                    <Plus className="size-4" />
+                    Regel hinzufügen
+                  </Button>
+                </div>
+                <div className="overflow-x-auto rounded-md border bg-background">
+                  {teamspaceAssignmentRules.length === 0 ? (
+                    <p className="px-3 py-4 text-sm text-muted-foreground">Noch keine automatische Zuordnungsregel angelegt.</p>
+                  ) : (
+                    <div className="min-w-[1580px] divide-y">
+                      {teamspaceAssignmentRules.map((rule, index) => {
+                        const targetExists = teamspaceProjectExclusions.some((entry) => entry.teamspace_project === rule.teamspace_project);
+
+                        return (
+                          <div key={rule.id ?? `new-${index}`} className="grid grid-cols-[230px_100px_220px_220px_300px_240px_110px_2.5rem] items-end gap-3 px-4 py-3">
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-name-${rule.id ?? index}`}>Regelname</label>
+                              <Input
+                                id={`assignment-rule-name-${rule.id ?? index}`}
+                                className="h-9"
+                                value={rule.name}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { name: event.currentTarget.value })}
+                              />
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-priority-${rule.id ?? index}`}>Priorität</label>
+                              <Input
+                                id={`assignment-rule-priority-${rule.id ?? index}`}
+                                className="h-9"
+                                type="number"
+                                min={0}
+                                max={100000}
+                                value={rule.priority}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { priority: Number(event.currentTarget.value) || 0 })}
+                              />
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-owner-${rule.id ?? index}`}>Zugeordnet ist</label>
+                              <select
+                                id={`assignment-rule-owner-${rule.id ?? index}`}
+                                className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                value={rule.customer_owner_option_id ?? ""}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { customer_owner_option_id: event.currentTarget.value || null })}
+                              >
+                                <option value="">Bedingung nicht verwenden</option>
+                                {customerOwnerOptions.map((option) => (
+                                  <option key={option.id} value={option.id} disabled={!option.active && option.id !== rule.customer_owner_option_id}>
+                                    {organizationAttributeOptionLabel(option)}
+                                  </option>
+                                ))}
+                              </select>
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-hotline-${rule.id ?? index}`}>Hotline ist</label>
+                              <select
+                                id={`assignment-rule-hotline-${rule.id ?? index}`}
+                                className="h-9 w-full rounded-md border border-input bg-background px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                value={rule.hotline_contract_option_id ?? ""}
+                                onChange={(event) => updateTeamspaceAssignmentRule(index, { hotline_contract_option_id: event.currentTarget.value || null })}
+                              >
+                                <option value="">Bedingung nicht verwenden</option>
+                                {hotlineContractOptions.map((option) => (
+                                  <option key={option.id} value={option.id} disabled={!option.active && option.id !== rule.hotline_contract_option_id}>
+                                    {organizationAttributeOptionLabel(option)}
+                                  </option>
+                                ))}
+                              </select>
+                            </div>
+                            <div className="flex h-9 items-center gap-4 rounded-md border bg-background px-3">
+                              <label className="flex items-center gap-2 text-sm">
+                                <Switch
+                                  checked={rule.support_enabled}
+                                  onCheckedChange={(checked) => updateTeamspaceAssignmentRule(index, { support_enabled: checked })}
+                                />
+                                Support
+                              </label>
+                              <label className="flex items-center gap-2 text-sm">
+                                <Switch
+                                  checked={rule.consulting_enabled}
+                                  onCheckedChange={(checked) => updateTeamspaceAssignmentRule(index, { consulting_enabled: checked })}
+                                />
+                                Consulting
+                              </label>
+                            </div>
+                            <div className="space-y-1">
+                              <label className="text-xs text-muted-foreground" htmlFor={`assignment-rule-target-${rule.id ?? index}`}>Ziel-TS-Projekt</label>
+                              <select
+                                id={`assignment-rule-target-${rule.id ?? index}`}
+                                className="h-9 w-full rounded-md border border-input bg-background px-3 font-mono text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                value={rule.teamspace_project}
+                                onChange={(event) => updateTeamspaceAssignmentRuleTarget(index, event.currentTarget.value)}
+                              >
+                                <option value="">Bitte wählen</option>
+                                {!targetExists && rule.teamspace_project ? <option value={rule.teamspace_project}>{rule.teamspace_project} · nicht mehr vorhanden</option> : null}
+                                {teamspaceProjectExclusions.map((entry) => (
+                                  <option key={entry.teamspace_project} value={entry.teamspace_project}>{entry.teamspace_project}</option>
+                                ))}
+                              </select>
+                            </div>
+                            <label className="flex h-9 items-center gap-2 text-sm">
+                              <Switch checked={rule.active} onCheckedChange={(checked) => updateTeamspaceAssignmentRule(index, { active: checked })} />
+                              Aktiv
+                            </label>
+                            <Button type="button" variant="ghost" size="icon" onClick={() => removeTeamspaceAssignmentRule(index)}>
+                              <Trash2 className="size-4" />
+                              <span className="sr-only">Zuordnungsregel entfernen</span>
+                            </Button>
+                          </div>
+                        );
+                      })}
+                    </div>
+                  )}
+                </div>
+                <div className="flex flex-wrap items-center gap-3">
+                  <Button type="button" variant="secondary" disabled={savingTeamspaceAssignmentRules} onClick={() => void saveAssignmentRules()}>
+                    <Save className="size-4" />
+                    {savingTeamspaceAssignmentRules ? "Speichert..." : "Zuordnungsregeln speichern"}
+                  </Button>
+                  <p className="text-xs text-muted-foreground">Zielprojekte müssen zuvor in der Ausnahmen-Liste gespeichert worden sein.</p>
+                </div>
+              </div>
             </div>
           </CardContent>
         </Card>
@@ -671,6 +902,7 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                   <TableHead>Rolle</TableHead>
                   <TableHead>Status</TableHead>
                   <TableHead>Neues Passwort</TableHead>
+                  <TableHead>TS-Istzeiten</TableHead>
                   <TableHead />
                 </TableRow>
               </TableHeader>
@@ -705,6 +937,45 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                           onChange={(event) => updateForm(user.id, { password: event.currentTarget.value })}
                         />
                       </TableCell>
+                      <TableCell>
+                        {isFixedAdmin ? (
+                          <span className="text-sm text-muted-foreground">-</span>
+                        ) : (
+                          <div className="grid min-w-[280px] gap-2">
+                            <div className="flex items-center gap-2">
+                              <Badge variant={initialActualsLocked(user) ? "secondary" : "outline"}>{initialActualsStatus(user)}</Badge>
+                              {!user.has_teamspace_credentials || !user.teamspace_user_id ? <Badge variant="warning">TS-Zugang fehlt</Badge> : null}
+                            </div>
+                            <div className="grid grid-cols-[minmax(120px,1fr)_auto_auto] gap-2">
+                              <Input
+                                className="h-8"
+                                type="month"
+                                value={initialActualsFromMonthByUser[user.id] ?? ""}
+                                onChange={(event) => setInitialActualsFromMonthByUser((current) => ({ ...current, [user.id]: event.currentTarget.value }))}
+                                disabled={initialActualsLocked(user) || syncingInitialActualsId === user.id}
+                              />
+                              <Button
+                                size="sm"
+                                variant="secondary"
+                                disabled={initialActualsLocked(user) || !user.has_teamspace_credentials || !user.teamspace_user_id || syncingInitialActualsId === user.id}
+                                onClick={() => void syncInitialActuals(user)}
+                              >
+                                <TimerReset className="size-4" />
+                                {syncingInitialActualsId === user.id ? "Läuft..." : "Sync"}
+                              </Button>
+                              <Button
+                                size="sm"
+                                variant="ghost"
+                                disabled={!initialActualsLocked(user) || unlockingInitialActualsId === user.id}
+                                onClick={() => void unlockInitialActuals(user)}
+                              >
+                                <RotateCcw className="size-4" />
+                                Entsperren
+                              </Button>
+                            </div>
+                          </div>
+                        )}
+                      </TableCell>
                       <TableCell className="text-right">
                         <Button size="sm" onClick={() => void saveUser(user)} disabled={savingId === user.id}>
                           <Save className="size-4" />
@@ -740,6 +1011,41 @@ export function AdminUsersPage({ currentUser }: { currentUser: AuthUser }) {
                     value={form.password}
                     onChange={(event) => updateForm(user.id, { password: event.currentTarget.value })}
                   />
+                  {!isFixedAdmin ? (
+                    <div className="space-y-2 rounded-md border bg-muted/20 p-2">
+                      <div className="flex flex-wrap items-center gap-2">
+                        <span className="text-sm font-medium">TS-Istzeiten</span>
+                        <Badge variant={initialActualsLocked(user) ? "secondary" : "outline"}>{initialActualsStatus(user)}</Badge>
+                        {!user.has_teamspace_credentials || !user.teamspace_user_id ? <Badge variant="warning">TS-Zugang fehlt</Badge> : null}
+                      </div>
+                      <div className="grid gap-2 sm:grid-cols-[minmax(140px,1fr)_auto_auto]">
+                        <Input
+                          type="month"
+                          value={initialActualsFromMonthByUser[user.id] ?? ""}
+                          onChange={(event) => setInitialActualsFromMonthByUser((current) => ({ ...current, [user.id]: event.currentTarget.value }))}
+                          disabled={initialActualsLocked(user) || syncingInitialActualsId === user.id}
+                        />
+                        <Button
+                          size="sm"
+                          variant="secondary"
+                          disabled={initialActualsLocked(user) || !user.has_teamspace_credentials || !user.teamspace_user_id || syncingInitialActualsId === user.id}
+                          onClick={() => void syncInitialActuals(user)}
+                        >
+                          <TimerReset className="size-4" />
+                          {syncingInitialActualsId === user.id ? "Läuft..." : "Sync"}
+                        </Button>
+                        <Button
+                          size="sm"
+                          variant="ghost"
+                          disabled={!initialActualsLocked(user) || unlockingInitialActualsId === user.id}
+                          onClick={() => void unlockInitialActuals(user)}
+                        >
+                          <RotateCcw className="size-4" />
+                          Entsperren
+                        </Button>
+                      </div>
+                    </div>
+                  ) : null}
                   <div className="flex items-center justify-between gap-2">
                     <label className="flex items-center gap-2 text-sm">
                       <Switch checked={form.active} disabled={isFixedAdmin} onCheckedChange={(active) => updateForm(user.id, { active })} />
diff --git a/frontend/src/views/AnalysisPage.tsx b/frontend/src/views/AnalysisPage.tsx
index 37f45b6..199003f 100644
--- a/frontend/src/views/AnalysisPage.tsx
+++ b/frontend/src/views/AnalysisPage.tsx
@@ -194,7 +194,7 @@ function TeamspaceDeviationIcon({ ticket }: { ticket: TicketSummary }) {
     return <span className="inline-block size-4" aria-hidden="true" />;
   }
 
-  const title = deltaMinutes > 0 ? `${formatMinutes(deltaMinutes)} fehlt in TT` : `${formatMinutes(Math.abs(deltaMinutes))} fehlt in TS`;
+  const title = deltaMinutes > 0 ? `${formatMinutes(deltaMinutes)} mehr in TS API` : `${formatMinutes(Math.abs(deltaMinutes))} mehr in TT-Teamspace`;
 
   return (
     <span title={`${formatSignedMinutes(deltaMinutes)} · ${title}`} aria-label={`Teamspace-Abweichung: ${title}`}>
diff --git a/frontend/src/views/DashboardTimersPage.tsx b/frontend/src/views/DashboardTimersPage.tsx
new file mode 100644
index 0000000..be8e1e7
--- /dev/null
+++ b/frontend/src/views/DashboardTimersPage.tsx
@@ -0,0 +1,179 @@
+import { useMemo, useState } from "react";
+import type { Dispatch, SetStateAction } from "react";
+import { FolderGit, Pause, Play, RotateCcw, Square, Timer } from "lucide-react";
+import { toast } from "sonner";
+
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { deleteActiveTimer, updateActiveTimer } from "../api";
+import { formatDateTime, formatTimer } from "../format";
+import { activeElapsedMs, mergeTimerActivityDrafts, removeTimerActivityDraft, type TimerEntry } from "../timers";
+import type { AuthUser } from "../types";
+
+type DashboardTimersPageProps = {
+  timers: TimerEntry[];
+  setTimers: Dispatch<SetStateAction<TimerEntry[]>>;
+  selectedTimerId: string | null;
+  setSelectedTimerId: Dispatch<SetStateAction<string | null>>;
+  tick: number;
+  currentUser: AuthUser;
+  onFinishTimer: (timerId: string) => void;
+  onOpenActiveTimer: () => void;
+};
+
+export function DashboardTimersPage({
+  timers,
+  setTimers,
+  selectedTimerId,
+  setSelectedTimerId,
+  tick,
+  currentUser,
+  onFinishTimer,
+  onOpenActiveTimer
+}: DashboardTimersPageProps) {
+  const [busyTimerId, setBusyTimerId] = useState<string | null>(null);
+  const sortedTimers = useMemo(
+    () =>
+      [...timers].sort((first, second) => {
+        if (first.phase === second.phase) {
+          return first.ticketNumber.localeCompare(second.ticketNumber);
+        }
+
+        return first.phase === "running" ? -1 : 1;
+      }),
+    [timers]
+  );
+  const runningTimer = timers.find((timer) => timer.phase === "running") ?? null;
+
+  async function setTimerPhase(timer: TimerEntry, phase: "running" | "paused") {
+    setBusyTimerId(timer.id);
+
+    try {
+      const result = await updateActiveTimer(timer.id, { phase });
+      setTimers(mergeTimerActivityDrafts(currentUser.id, result.timers));
+      setSelectedTimerId(timer.id);
+    } catch (error) {
+      toast.error("Timer konnte nicht aktualisiert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setBusyTimerId(null);
+    }
+  }
+
+  async function discardTimer(timer: TimerEntry) {
+    const confirmed = window.confirm(`Timer ${timer.ticketNumber} verwerfen? Alle bisherigen Änderungen und Notizen an diesem Timer gehen verloren.`);
+
+    if (!confirmed) {
+      return;
+    }
+
+    setBusyTimerId(timer.id);
+
+    try {
+      const result = await deleteActiveTimer(timer.id);
+      removeTimerActivityDraft(currentUser.id, timer.id);
+      setTimers(mergeTimerActivityDrafts(currentUser.id, result.timers));
+      toast.success("Timer verworfen", {
+        description: timer.ticketNumber
+      });
+    } catch (error) {
+      toast.error("Timer konnte nicht verworfen werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setBusyTimerId(null);
+    }
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex flex-col gap-2 sm:flex-row sm:items-end sm:justify-between">
+        <div>
+          <h2 className="text-xl font-semibold tracking-normal sm:text-2xl">Timer-Übersicht</h2>
+          <p className="text-sm text-muted-foreground">Aktiven Timer und pausierte Timer zentral umschalten.</p>
+        </div>
+        {runningTimer ? <Badge variant="success">Aktiv: {runningTimer.ticketNumber}</Badge> : timers.length > 0 ? <Badge variant="warning">Alle pausiert</Badge> : <Badge variant="info">Kein Timer</Badge>}
+      </div>
+
+      <div className="grid gap-3">
+        {sortedTimers.map((timer) => {
+          const isRunning = timer.phase === "running";
+          const isSelected = selectedTimerId === timer.id;
+          const elapsedSeconds = Math.floor(activeElapsedMs(timer, tick) / 1000);
+
+          return (
+            <Card key={timer.id} className={isSelected ? "border-primary/60" : ""}>
+              <CardContent className="grid gap-3 p-4 lg:grid-cols-[minmax(0,1fr)_180px_auto] lg:items-center">
+                <button
+                  type="button"
+                  className={isRunning ? "min-w-0 text-left underline-offset-4 hover:underline" : "min-w-0 cursor-default text-left"}
+                  onClick={() => {
+                    setSelectedTimerId(timer.id);
+
+                    if (isRunning) {
+                      onOpenActiveTimer();
+                    }
+                  }}
+                >
+                  <div className="flex min-w-0 flex-wrap items-center gap-2">
+                    <span className={isRunning ? "size-2 rounded-full bg-emerald-500" : "size-2 rounded-full bg-muted-foreground/50"} />
+                    <span className="font-semibold">{timer.ticketNumber}</span>
+                    <Badge variant={isRunning ? "success" : "secondary"}>{isRunning ? "aktiv" : "pausiert"}</Badge>
+                    {timer.workType ? <Badge variant="outline">{timer.workType === "support" ? "Support" : "Consulting"}</Badge> : null}
+                  </div>
+                  <p className="mt-1 truncate text-sm text-muted-foreground">
+                    {timer.isProject ? <FolderGit className="mr-1 inline size-3.5" /> : null}
+                    {timer.organizationName ?? timer.projectName ?? "Ticketdaten noch nicht geladen"}
+                  </p>
+                  {timer.activity.trim() ? <p className="mt-1 line-clamp-2 text-sm">{timer.activity}</p> : null}
+                  <p className="mt-1 text-xs text-muted-foreground">Gestartet: {formatDateTime(new Date(timer.startedAt).toISOString())}</p>
+                </button>
+
+                <div className="rounded-md border bg-muted/20 px-3 py-2">
+                  <p className="text-xs text-muted-foreground">Gemessen</p>
+                  <p className="font-mono text-2xl font-semibold tracking-normal">{formatTimer(elapsedSeconds)}</p>
+                </div>
+
+                <div className="flex flex-wrap gap-2 lg:justify-end">
+                  {isRunning ? (
+                    <Button type="button" variant="secondary" disabled={busyTimerId === timer.id} onClick={() => void setTimerPhase(timer, "paused")}>
+                      <Pause className="size-4" />
+                      Pausieren
+                    </Button>
+                  ) : (
+                    <Button type="button" disabled={busyTimerId === timer.id} onClick={() => void setTimerPhase(timer, "running")}>
+                      <Play className="size-4" />
+                      Aktivieren
+                    </Button>
+                  )}
+                  <Button type="button" variant="destructive" onClick={() => onFinishTimer(timer.id)}>
+                    <Square className="size-4" />
+                    Stoppen
+                  </Button>
+                  <Button type="button" variant="ghost" disabled={busyTimerId === timer.id} onClick={() => void discardTimer(timer)}>
+                    <RotateCcw className="size-4" />
+                    Verwerfen
+                  </Button>
+                </div>
+              </CardContent>
+            </Card>
+          );
+        })}
+
+        {sortedTimers.length === 0 ? (
+          <Card>
+            <CardContent className="grid place-items-center gap-2 p-8 text-center">
+              <Timer className="size-8 text-muted-foreground" />
+              <div>
+                <p className="font-medium">Keine Timer vorbereitet</p>
+                <p className="text-sm text-muted-foreground">Starte oben einen Timer oder nutze den Schnellstart in der Kopfzeile.</p>
+              </div>
+            </CardContent>
+          </Card>
+        ) : null}
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/views/MonthlyClosePage.tsx b/frontend/src/views/MonthlyClosePage.tsx
index 587ab09..79e41a8 100644
--- a/frontend/src/views/MonthlyClosePage.tsx
+++ b/frontend/src/views/MonthlyClosePage.tsx
@@ -7,12 +7,10 @@ import {
   FileWarning,
   Lock,
   LockOpen,
-  Sparkles,
 } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
 import { Alert } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -21,8 +19,8 @@ import { Checkbox } from "@/components/ui/checkbox";
 import { Input } from "@/components/ui/input";
 import { CopyTicketButton } from "@/components/CopyTicketButton";
 import { HelpLink } from "@/components/HelpLink";
-import { acknowledgeMissingTicketDayBilling, closePeriod, getStatisticsOverview, reopenPeriod } from "../api";
-import { currentMonth, currentWeek, formatDate, formatDateTime, formatMinutes } from "../format";
+import { closePeriod, getStatisticsOverview, reopenPeriod } from "../api";
+import { currentMonth, currentWeek, formatDateTime, formatMinutes } from "../format";
 import type { AuthUser, StatisticsCrmDay, StatisticsOpenSession, StatisticsOverview, StatisticsTeamspaceDay, StatisticsTeamspaceMonthMismatch } from "../types";
 
 type MonthlyClosePageProps = {
@@ -30,8 +28,6 @@ type MonthlyClosePageProps = {
   onNavigate: (to: string) => void;
 };
 
-const trackedTextClass = "text-sky-700 dark:text-sky-300";
-const teamspaceTextClass = "text-emerald-700 dark:text-emerald-300";
 const showAcknowledgedMissingCrmStorageKey = "tickettracker.monthlyClose.showAcknowledgedMissingCrm";
 const monthlyCloseViewModeStorageKey = "tickettracker.monthlyClose.viewMode";
 
@@ -45,28 +41,16 @@ function readMonthlyCloseViewMode(): MonthlyCloseViewMode {
   return window.localStorage.getItem(monthlyCloseViewModeStorageKey) === "week" ? "week" : "month";
 }
 
-function formatSignedMinutes(minutes: number) {
-  if (minutes === 0) {
-    return "ausgeglichen";
-  }
-
-  return `${minutes > 0 ? "+" : "-"}${formatMinutes(Math.abs(minutes))}`;
-}
-
-function formatTeamspaceDelta(minutes: number) {
-  return formatSignedMinutes(minutes);
-}
-
 function formatMissingTarget(minutes: number, teamspaceTimeTrackingEnabled: boolean) {
   if (minutes === 0) {
     return "ausgeglichen";
   }
 
   if (minutes > 0) {
-    return `${formatMinutes(minutes)} fehlt ${teamspaceTimeTrackingEnabled ? "in TT" : "in den abgerechneten Zeiten"}`;
+    return `${formatMinutes(minutes)} mehr in TS API`;
   }
 
-  return `${formatMinutes(Math.abs(minutes))} fehlt in TS`;
+  return `${formatMinutes(Math.abs(minutes))} mehr ${teamspaceTimeTrackingEnabled ? "in TT-Teamspace" : "in den abgerechneten Zeiten"}`;
 }
 
 function StatusCard({ label, value, detail, tone }: { label: string; value: string | number; detail: string; tone?: "ok" | "warn" | "neutral" }) {
@@ -77,104 +61,177 @@ function StatusCard({ label, value, detail, tone }: { label: string; value: stri
       <CardContent className="p-3">
         <p className="text-xs font-medium text-muted-foreground">{label}</p>
         <p className={`text-xl font-semibold tracking-normal ${valueClassName}`}>{value}</p>
-        <p className="text-xs text-muted-foreground ">{detail}</p>
+        <p className="text-xs text-muted-foreground whitespace-pre-line">{detail}</p>
       </CardContent>
     </Card>
   );
 }
 
-type OpenTicketGroup = {
+type MonthlyCloseTicketDay = {
+  day: string;
+  missingCrm: StatisticsCrmDay | null;
+  ticketMismatch: StatisticsTeamspaceDay | null;
+};
+
+type MonthlyCloseTicketGroup = {
   ticketId: string;
   ticketNumber: string;
   organizationName: string;
   month: string;
   openCount: number;
   totalMinutes: number;
-};
-
-type OpenReviewGroup = OpenTicketGroup & {
   mismatch: StatisticsTeamspaceMonthMismatch | null;
+  days: MonthlyCloseTicketDay[];
 };
 
-function groupOpenSessions(sessions: StatisticsOpenSession[]) {
-  const groups = new Map<string, OpenTicketGroup>();
+type MutableMonthlyCloseTicketGroup = Omit<MonthlyCloseTicketGroup, "days"> & {
+  days: Map<string, MonthlyCloseTicketDay>;
+};
 
-  for (const session of sessions) {
-    const existing = groups.get(session.ticket_id);
+const monthlyCloseTicketGridClassName =
+  "xl:grid-cols-[minmax(10rem,1fr)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_minmax(4.25rem,7rem)_11.5rem]";
+
+function buildMonthlyCloseTicketGroups(
+  sessions: StatisticsOpenSession[],
+  monthMismatches: StatisticsTeamspaceMonthMismatch[],
+  ticketDayMismatches: StatisticsTeamspaceDay[],
+  missingCrmDays: StatisticsCrmDay[],
+  fallbackMonth: string
+) {
+  const groups = new Map<string, MutableMonthlyCloseTicketGroup>();
+
+  function ensureGroup(ticketId: string, ticketNumber: string, organizationName: string, month: string) {
+    const existing = groups.get(ticketId);
 
     if (existing) {
-      existing.openCount += 1;
-      existing.totalMinutes += session.rounded_minutes;
-      continue;
+      if (!existing.organizationName && organizationName) {
+        existing.organizationName = organizationName;
+      }
+
+      return existing;
     }
 
-    groups.set(session.ticket_id, {
-      ticketId: session.ticket_id,
-      ticketNumber: session.ticket_number,
-      organizationName: session.organization_name,
-      month: session.started_at.slice(0, 7),
-      openCount: 1,
-      totalMinutes: session.rounded_minutes
-    });
-  }
-
-  return Array.from(groups.values()).sort((left, right) => left.ticketNumber.localeCompare(right.ticketNumber, "de", { numeric: true, sensitivity: "base" }));
-}
-
-function buildOpenReviewGroups(openGroups: OpenTicketGroup[], mismatches: StatisticsTeamspaceMonthMismatch[], month: string) {
-  const groups = new Map<string, OpenReviewGroup>();
-
-  for (const group of openGroups) {
-    groups.set(group.ticketId, { ...group, mismatch: null });
-  }
-
-  for (const mismatch of mismatches) {
-    const existing = groups.get(mismatch.ticket_id);
-
-    if (existing) {
-      existing.mismatch = mismatch;
-      continue;
-    }
-
-    groups.set(mismatch.ticket_id, {
-      ticketId: mismatch.ticket_id,
-      ticketNumber: mismatch.ticket_number,
-      organizationName: mismatch.organization_name,
+    const group: MutableMonthlyCloseTicketGroup = {
+      ticketId,
+      ticketNumber,
+      organizationName,
       month,
       openCount: 0,
       totalMinutes: 0,
-      mismatch
-    });
+      mismatch: null,
+      days: new Map()
+    };
+    groups.set(ticketId, group);
+    return group;
   }
 
-  return Array.from(groups.values()).sort((left, right) => left.ticketNumber.localeCompare(right.ticketNumber, "de", { numeric: true, sensitivity: "base" }));
+  for (const session of sessions) {
+    const group = ensureGroup(session.ticket_id, session.ticket_number, session.organization_name, session.started_at.slice(0, 7));
+    group.openCount += 1;
+    group.totalMinutes += session.rounded_minutes;
+  }
+
+  for (const mismatch of monthMismatches) {
+    ensureGroup(mismatch.ticket_id, mismatch.ticket_number, mismatch.organization_name, fallbackMonth).mismatch = mismatch;
+  }
+
+  for (const mismatch of ticketDayMismatches) {
+    if (!mismatch.ticket_id || !mismatch.ticket_number) {
+      continue;
+    }
+
+    const group = ensureGroup(mismatch.ticket_id, mismatch.ticket_number, mismatch.organization_name, mismatch.day.slice(0, 7));
+    const day = group.days.get(mismatch.day) ?? { day: mismatch.day, missingCrm: null, ticketMismatch: null };
+    day.ticketMismatch = mismatch;
+    group.days.set(mismatch.day, day);
+  }
+
+  for (const missingCrm of missingCrmDays) {
+    const group = ensureGroup(missingCrm.ticket_id, missingCrm.ticket_number, missingCrm.organization_name, missingCrm.day.slice(0, 7));
+    const day = group.days.get(missingCrm.day) ?? { day: missingCrm.day, missingCrm: null, ticketMismatch: null };
+    day.missingCrm = missingCrm;
+    group.days.set(missingCrm.day, day);
+  }
+
+  return Array.from(groups.values())
+    .map((group): MonthlyCloseTicketGroup => ({
+      ...group,
+      days: Array.from(group.days.values()).sort((left, right) => left.day.localeCompare(right.day))
+    }))
+    .sort((left, right) => left.ticketNumber.localeCompare(right.ticketNumber, "de", { numeric: true, sensitivity: "base" }));
 }
 
-function OpenReviewItem({
+function MonthlyCloseTicketItem({
   group,
-  teamspaceTimeTrackingEnabled,
   onNavigate
 }: {
-  group: OpenReviewGroup;
-  teamspaceTimeTrackingEnabled: boolean;
+  group: MonthlyCloseTicketGroup;
   onNavigate: (to: string) => void;
 }) {
+  const missingDayCount = group.days.filter((day) => day.missingCrm && !day.missingCrm.acknowledged).length;
+  const acknowledgedDayCount = group.days.filter((day) => day.missingCrm?.acknowledged).length;
+  const mismatchDayCount = group.days.filter((day) => day.ticketMismatch && day.ticketMismatch.delta_minutes !== 0).length;
+  const invalidTeamspaceValueDayCount = group.days.filter((day) => day.ticketMismatch?.tt_value_without_billed_session).length;
+  const monthDeltaMinutes = group.mismatch?.teamspace_month_delta_minutes ?? 0;
+  const monthDeltaLabel = monthDeltaMinutes > 0
+    ? `TS +${formatMinutes(monthDeltaMinutes)}`
+    : `TT +${formatMinutes(Math.abs(monthDeltaMinutes))}`;
+  const metricClassName = (visible: boolean) => `${visible ? "flex" : "hidden xl:flex"} min-h-7 items-center justify-between gap-2 rounded-md bg-muted/30 px-2 xl:min-h-5 xl:justify-center xl:rounded-none xl:bg-transparent xl:px-0`;
+
   return (
-    <div className="rounded-md border bg-background px-3 py-2">
-      <div className="flex items-start justify-between gap-3">
-        <div className="min-w-0 space-y-1">
-          <div className="flex flex-wrap items-center gap-2">
-            <span className="font-medium">{group.ticketNumber}</span>
-            <CopyTicketButton ticketNumber={group.ticketNumber} />
-            {group.openCount > 0 ? <Badge variant="warning" className="text-xxs">{group.openCount} Bewertung(en)</Badge> : null}
-            {group.mismatch ? <Badge variant="warning" className="text-xxs">{formatMissingTarget(group.mismatch.teamspace_month_delta_minutes, teamspaceTimeTrackingEnabled)}</Badge> : null}
-          </div>
-          <p className="truncate text-sm text-muted-foreground">{group.organizationName}</p>
-          <div className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
-            {group.openCount > 0 ? <span className={trackedTextClass}>{formatMinutes(group.totalMinutes)} offen zu bewerten</span> : null}
-          </div>
-        </div>
-        <Button className="h-8 shrink-0" variant="secondary" size="sm" onClick={() => onNavigate(`/tickets/${group.ticketId}?month=${group.month}`)}>
+    <div className={`grid grid-cols-1 items-center gap-1.5 rounded-md border bg-background px-3 py-2.5 sm:grid-cols-2 xl:gap-2 ${monthlyCloseTicketGridClassName}`}>
+      <div className="min-w-0 sm:col-span-2 xl:col-span-1">
+        <p className="font-medium">{group.ticketNumber}</p>
+        <p className="truncate text-xs text-muted-foreground">{group.organizationName}</p>
+      </div>
+      <div className={metricClassName(group.openCount > 0)}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Offene Bewertungen</span>
+        {group.openCount > 0 ? (
+          <Badge className="bg-amber-500/12 text-amber-800 dark:bg-amber-500/20 dark:text-amber-200" title={`${group.openCount} offene Bewertung(en) · ${formatMinutes(group.totalMinutes)}`}>
+            {group.openCount}
+          </Badge>
+        ) : null}
+      </div>
+      <div className={metricClassName(Boolean(group.mismatch))}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Monatsabweichung</span>
+        {group.mismatch ? (
+          <Badge className="bg-orange-500/12 text-orange-800 dark:bg-orange-500/20 dark:text-orange-200" title="Monatsabweichung zwischen TT-Teamspace und TS-API">
+            {monthDeltaLabel}
+          </Badge>
+        ) : null}
+      </div>
+      <div className={metricClassName(missingDayCount > 0 || acknowledgedDayCount > 0)}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Fehlender TT-Wert</span>
+        <span className="flex flex-wrap items-center justify-end gap-1 xl:flex-col xl:justify-center">
+          {missingDayCount > 0 ? (
+            <Badge className="bg-sky-500/12 text-sky-800 dark:bg-sky-500/20 dark:text-sky-200" title={`${missingDayCount} Tag(e) ohne TT-Teamspace-Wert`}>
+              TT {missingDayCount}
+            </Badge>
+          ) : null}
+          {acknowledgedDayCount > 0 ? (
+            <Badge className="bg-emerald-500/12 text-emerald-800 dark:bg-emerald-500/20 dark:text-emerald-200" title={`${acknowledgedDayCount} zur Kenntnis genommene(r) Tag(e)`}>
+              ✓ {acknowledgedDayCount}
+            </Badge>
+          ) : null}
+        </span>
+      </div>
+      <div className={metricClassName(mismatchDayCount > 0)}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">Tagesabweichung</span>
+        {mismatchDayCount > 0 ? (
+          <Badge className="bg-violet-500/12 text-violet-800 dark:bg-violet-500/20 dark:text-violet-200" title={`${mismatchDayCount} Tag(e) mit Abweichung zwischen TT und TS`}>
+            {mismatchDayCount}
+          </Badge>
+        ) : null}
+      </div>
+      <div className={metricClassName(invalidTeamspaceValueDayCount > 0)}>
+        <span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground xl:hidden">TT-Wert ohne Abrechnung</span>
+        {invalidTeamspaceValueDayCount > 0 ? (
+          <Badge variant="destructive" title={`${invalidTeamspaceValueDayCount} Tag(e) mit TT-Teamspace-Wert, aber ohne abgerechnete Session`}>{invalidTeamspaceValueDayCount}</Badge>
+        ) : null}
+      </div>
+      <div className="flex shrink-0 items-center justify-end gap-1.5 pt-0.5 sm:col-span-2 xl:col-span-1 xl:pt-0">
+        <CopyTicketButton ticketNumber={group.ticketNumber} />
+        <Button className="h-8" variant="secondary" size="sm" onClick={() => onNavigate(`/tickets/${group.ticketId}?month=${group.month}`)}>
           Ticket öffnen
           <ExternalLink className="size-4" />
         </Button>
@@ -183,77 +240,6 @@ function OpenReviewItem({
   );
 }
 
-function CrmDayItem({
-  item,
-  busy,
-  onSetAcknowledgement,
-  onNavigate
-}: {
-  item: StatisticsCrmDay;
-  busy: boolean;
-  onSetAcknowledgement: (item: StatisticsCrmDay, acknowledged: boolean) => void;
-  onNavigate: (to: string) => void;
-}) {
-  const isAcknowledged = Boolean(item.acknowledged);
-
-  return (
-    <div className={`rounded-md border bg-background px-3 py-2 ${isAcknowledged ? "opacity-75" : ""}`}>
-      <div className="flex items-start justify-between gap-3">
-        <div className="min-w-0 space-y-1">
-          <div className="flex flex-wrap items-center gap-2">
-            <span className="font-medium">{item.ticket_number}</span>
-            <CopyTicketButton ticketNumber={item.ticket_number} />
-            <Badge variant="outline">{formatDate(`${item.day}T00:00:00`)}</Badge>
-            <Badge variant={isAcknowledged ? "success" : "warning"}>{isAcknowledged ? "zur Kenntnis" : "offen"}</Badge>
-          </div>
-          <p className="truncate text-sm text-muted-foreground">{item.organization_name}</p>
-          <p className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
-            <span className={trackedTextClass}>Abgerechnet {formatMinutes(item.tracked_minutes)}</span>
-            <span className={teamspaceTextClass}>Teamspace {formatMinutes(item.crm_billed_minutes)}</span>
-            {typeof item.delta_minutes === "number" ? <span className="text-muted-foreground">Differenz {formatTeamspaceDelta(item.delta_minutes)}</span> : null}
-          </p>
-        </div>
-        <div className="flex shrink-0 flex-wrap justify-end gap-2">
-          <Button className="h-8" variant={isAcknowledged ? "secondary" : "ghost"} size="sm" disabled={busy} onClick={() => onSetAcknowledgement(item, !isAcknowledged)}>
-            {isAcknowledged ? "Zurücknehmen" : "Zur Kenntnis"}
-          </Button>
-          <Button className="h-8" variant="secondary" size="sm" onClick={() => onNavigate(`/tickets/${item.ticket_id}?month=${item.day.slice(0, 7)}`)}>
-            Tag öffnen
-            <ExternalLink className="size-4" />
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function TeamspaceDayItem({ item, onNavigate }: { item: StatisticsTeamspaceDay; onNavigate: (to: string) => void }) {
-  return (
-    <div className="grid gap-3 rounded-md border bg-background px-3 py-2 lg:grid-cols-[minmax(8rem,0.75fr)_minmax(0,1.65fr)_minmax(8rem,0.6fr)] lg:items-center">
-      <div className="flex flex-wrap items-center gap-2">
-        <Badge variant="outline">{formatDate(`${item.day}T00:00:00`)}</Badge>
-      </div>
-      <div className="min-w-0 space-y-1">
-        <div className="flex min-w-0 flex-wrap items-center gap-2">
-          <button
-            type="button"
-            className="font-medium underline-offset-4 hover:underline"
-            onClick={() => onNavigate(`/tickets/${item.ticket_id}?month=${item.day.slice(0, 7)}`)}
-          >
-            {item.ticket_number}
-          </button>
-          <CopyTicketButton ticketNumber={item.ticket_number} />
-          {item.project_teamspace_project ? <Badge variant="secondary">{item.project_teamspace_project}</Badge> : null}
-        </div>
-        <p className="truncate text-sm text-muted-foreground">{item.organization_name}</p>
-      </div>
-      <div className="text-sm">
-        <Badge variant="success">{formatMinutes(item.crm_billed_minutes)}</Badge>
-      </div>
-    </div>
-  );
-}
-
 export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePageProps) {
   const [viewMode, setViewMode] = useState<MonthlyCloseViewMode>(() => readMonthlyCloseViewMode());
   const [month, setMonth] = useState(currentMonth());
@@ -262,7 +248,6 @@ export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePagePr
   const [loading, setLoading] = useState(false);
   const [closing, setClosing] = useState(false);
   const [reopening, setReopening] = useState(false);
-  const [acknowledgingKeys, setAcknowledgingKeys] = useState<Set<string>>(() => new Set());
   const [showAcknowledgedMissingCrm, setShowAcknowledgedMissingCrm] = useState(false);
   const [showAcknowledgedMissingCrmLoaded, setShowAcknowledgedMissingCrmLoaded] = useState(false);
   const loadRequestId = useRef(0);
@@ -374,58 +359,47 @@ export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePagePr
     }
   }
 
-  async function setMissingCrmAcknowledgement(item: StatisticsCrmDay, acknowledged: boolean) {
-    const key = `${item.ticket_id}:${item.day}`;
-    setAcknowledgingKeys((current) => new Set(current).add(key));
-
-    try {
-      await acknowledgeMissingTicketDayBilling(item.ticket_id, item.day, acknowledged);
-      toast.success(acknowledged ? "Teamspace-Prüfung abgehakt" : "Kenntnisnahme zurückgenommen", {
-        description: `${item.ticket_number} am ${formatDate(`${item.day}T00:00:00`)}`
-      });
-      await load();
-    } catch (error) {
-      toast.error(acknowledged ? "Konnte nicht abgehakt werden" : "Konnte nicht zurückgenommen werden", {
-        description: error instanceof Error ? error.message : "Unbekannter Fehler"
-      });
-    } finally {
-      setAcknowledgingKeys((current) => {
-        const next = new Set(current);
-        next.delete(key);
-        return next;
-      });
-    }
-  }
-
   const openSessions = stats?.attention.openSessions ?? [];
   const missingCrmDays = stats?.attention.missingCrmDays ?? [];
   const acknowledgedMissingCrmDays = stats?.attention.acknowledgedMissingCrmDays ?? [];
   const teamspaceMonthMismatches = stats?.attention.teamspaceMonthMismatches ?? [];
-  const teamspaceDays = stats?.teamspaceDays ?? [];
+  const ticketTeamspaceMismatches = stats?.attention.ticketTeamspaceMismatches ?? [];
   const billedMinutes = stats?.totals.billedMinutes ?? 0;
   const ttTeamspaceMinutes = stats?.totals.crmBilledMinutes ?? 0;
   const teamspaceApiBillableMinutes = stats?.totals.teamspaceApiBillableMinutes ?? 0;
   const teamspaceApiDeltaMinutes = stats?.totals.teamspaceApiDeltaMinutes ?? 0;
-  const openTicketGroups = useMemo(() => groupOpenSessions(openSessions), [openSessions]);
-  const openReviewGroups = useMemo(() => buildOpenReviewGroups(openTicketGroups, teamspaceMonthMismatches, month), [month, openTicketGroups, teamspaceMonthMismatches]);
   const visibleMissingCrmDays = useMemo(() => {
     const days = showAcknowledgedMissingCrm ? [...missingCrmDays, ...acknowledgedMissingCrmDays] : [...missingCrmDays];
     return days.sort((left, right) => left.day.localeCompare(right.day) || left.ticket_number.localeCompare(right.ticket_number, "de", { numeric: true, sensitivity: "base" }));
   }, [acknowledgedMissingCrmDays, missingCrmDays, showAcknowledgedMissingCrm]);
+  const activeReviewTicketGroups = useMemo(
+    () => buildMonthlyCloseTicketGroups(openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches, missingCrmDays, month),
+    [missingCrmDays, month, openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches]
+  );
+  const visibleReviewTicketGroups = useMemo(
+    () => buildMonthlyCloseTicketGroups(openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches, visibleMissingCrmDays, month),
+    [month, openSessions, teamspaceMonthMismatches, ticketTeamspaceMismatches, visibleMissingCrmDays]
+  );
+  const teamspaceAttentionTicketCount = activeReviewTicketGroups.filter((group) => group.mismatch || group.days.length > 0).length;
+  const missingCrmTicketCount = new Set(missingCrmDays.map((item) => item.ticket_id)).size;
+  const ticketTeamspaceDeviationCount = ticketTeamspaceMismatches.filter((item) => item.delta_minutes !== 0).length;
+  const invalidTeamspaceValueDayCount = ticketTeamspaceMismatches.filter((item) => item.tt_value_without_billed_session).length;
   const canClose = Boolean(isMonthView && stats && !stats.closed && stats.totals.sessions > 0 && openSessions.length === 0);
   const checklist = useMemo(
     () => [
       {
-        label: "Offene Prüfungen",
-        ok: openReviewGroups.length === 0,
-        value: openReviewGroups.length,
-        detail: openReviewGroups.length === 0 ? "Keine offenen Prüfungen." : `${openReviewGroups.length} Ticket(s) prüfen`
+        label: "Tickets zu prüfen",
+        ok: activeReviewTicketGroups.length === 0,
+        value: activeReviewTicketGroups.length,
+        detail: activeReviewTicketGroups.length === 0 ? "Keine offenen Prüfpunkte." : `${activeReviewTicketGroups.length} Ticket(s) mit mindestens einem Prüfpunkt`
       },
       {
         label: "Teamspace geprüft",
-        ok: missingCrmDays.length === 0 && teamspaceMonthMismatches.length === 0,
-        value: missingCrmDays.length + teamspaceMonthMismatches.length,
-        detail: missingCrmDays.length === 0 && teamspaceMonthMismatches.length === 0 ? "Keine offenen Teamspace-Prüfpunkte." : `${teamspaceMonthMismatches.length} Monatsabweichung(en), ${acknowledgedMissingCrmDays.length} zur Kenntnis genommen`
+        ok: teamspaceAttentionTicketCount === 0,
+        value: teamspaceAttentionTicketCount,
+        detail: teamspaceAttentionTicketCount === 0
+          ? "Keine offenen Teamspace-Prüfpunkte."
+          : `${missingCrmDays.length} fehlende Tageswerte, ${ticketTeamspaceDeviationCount} Tagesabweichungen, ${invalidTeamspaceValueDayCount} TS-Werte ohne Abrechnung, ${teamspaceMonthMismatches.length} Monatsabweichungen`
       },
       {
         label: isMonthView ? "Monat abschließbar" : "Wochenansicht",
@@ -434,7 +408,7 @@ export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePagePr
         detail: isMonthView ? (stats?.closed ? "Monat ist gesperrt." : canClose ? "Kann abgeschlossen werden." : "Bewertungen prüfen.") : "Abschluss bleibt monatlich."
       }
     ],
-    [acknowledgedMissingCrmDays.length, canClose, isMonthView, missingCrmDays.length, openReviewGroups.length, stats?.closed, teamspaceMonthMismatches.length]
+    [activeReviewTicketGroups.length, canClose, invalidTeamspaceValueDayCount, isMonthView, missingCrmDays.length, stats?.closed, teamspaceAttentionTicketCount, teamspaceMonthMismatches.length, ticketTeamspaceDeviationCount]
   );
 
   return (
@@ -442,7 +416,7 @@ export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePagePr
       <div className="flex flex-col gap-3 xl:flex-row xl:items-end xl:justify-between">
         <div>
           <h2 className="text-2xl font-semibold tracking-normal">Monatsabschluss</h2>
-          <p className="text-sm text-muted-foreground">Offene Bewertungen und Teamspace-Abgleich für {periodAttentionLabel}; der Abschluss selbst bleibt monatlich.</p>
+          <p className="text-sm text-muted-foreground">Offene Bewertungen und TS-API-Abgleich für {periodAttentionLabel}; der Abschluss selbst bleibt monatlich.</p>
         </div>
         <div className="grid gap-2 sm:grid-cols-[auto_minmax(220px,300px)_auto] sm:items-end">
           <div className="space-y-1">
@@ -509,21 +483,21 @@ export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePagePr
           detail={`${formatMinutes(stats?.totals.minutes ?? 0)} abgerechnet`}
         />
         <StatusCard
-          label="Teamspace-Werte"
+          label="TT-Teamspace"
           value={formatMinutes(ttTeamspaceMinutes)}
           detail={`aus TS API ${formatMinutes(teamspaceApiBillableMinutes)}\n${formatMissingTarget(teamspaceApiDeltaMinutes, teamspaceTimeTrackingEnabled)}`}
           tone={teamspaceApiDeltaMinutes !== 0 ? "warn" : "ok"}
         />
         <StatusCard
-          label="Offene Prüfungen"
-          value={openReviewGroups.length}
-          detail={`${openSessions.length} Bewertung(en)\n${teamspaceMonthMismatches.length}TS-Abweichung(en)`}
-          tone={openReviewGroups.length > 0 ? "warn" : "ok"}
+          label="Tickets zu prüfen"
+          value={activeReviewTicketGroups.length}
+          detail={`${openSessions.length} offene Bewertung(en)\n${teamspaceAttentionTicketCount} Ticket(s) mit TS-Prüfpunkten`}
+          tone={activeReviewTicketGroups.length > 0 ? "warn" : "ok"}
         />
         <StatusCard
-          label="Ohne Teamspace"
-          value={missingCrmDays.length}
-          detail={`${acknowledgedMissingCrmDays.length} zur Kenntnis genommen`}
+          label="Ohne TT-Teamspace"
+          value={missingCrmTicketCount}
+          detail={`${missingCrmDays.length} Tag(e) · ${acknowledgedMissingCrmDays.length} zur Kenntnis`}
           tone={missingCrmDays.length > 0 ? "warn" : "ok"}
         />
         <StatusCard
@@ -561,8 +535,11 @@ export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePagePr
         <CardHeader className="p-4">
           <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
             <div>
-              <CardTitle>Aufräumen</CardTitle>
-              <CardDescription>Alles, was für {periodAttentionLabel} noch Aufmerksamkeit braucht.</CardDescription>
+              <CardTitle className="flex items-center gap-2">
+                <FileWarning className="size-4 text-muted-foreground" />
+                Prüfliste nach Ticket
+              </CardTitle>
+              <CardDescription>Offene Bewertungen, fehlende Tageswerte sowie Monats- und Tagesabweichungen – je Ticket einmal in festen Statusspalten.</CardDescription>
             </div>
             <div className="flex flex-wrap items-center gap-2">
               <div className="inline-flex h-8 items-center gap-2 rounded-md border bg-background px-3 text-sm">
@@ -577,63 +554,40 @@ export function MonthlyClosePage({ currentUser, onNavigate }: MonthlyClosePagePr
             </div>
           </div>
         </CardHeader>
-        <CardContent className="grid gap-4 px-4 pb-4 xl:grid-cols-2">
-          <section className="space-y-2">
-            <div className="flex min-h-8 items-center gap-2 text-sm font-medium">
-              <FileWarning className="size-4 text-muted-foreground" />
-              Offene Prüfungen
+        <CardContent className="space-y-3 px-4 pb-4">
+          <div className="flex flex-wrap items-center justify-between gap-2 text-xs text-muted-foreground">
+            <span>{visibleReviewTicketGroups.length} Ticket(s) angezeigt</span>
+            <span>Tagesdetails stehen im jeweiligen Ticket</span>
+          </div>
+          {visibleReviewTicketGroups.length > 0 ? (
+            <div className="space-y-2">
+              <div className={`hidden items-end gap-2 border border-transparent px-3 text-[11px] font-medium leading-tight uppercase tracking-wide text-muted-foreground xl:grid ${monthlyCloseTicketGridClassName}`}>
+                <span>Ticket</span>
+                <span className="text-center">Offene<br />Bewertungen</span>
+                <span className="text-center">Monatsabweichung<br />TT / TS</span>
+                <span className="text-center">Fehlender<br />TT-Wert</span>
+                <span className="text-center">Tagesabweichung<br />TT / TS</span>
+                <span className="text-center">TT-Wert ohne<br />Abrechnung</span>
+                <span className="sr-only">Aktionen</span>
+              </div>
+              {visibleReviewTicketGroups.map((group) => (
+                <MonthlyCloseTicketItem
+                  key={group.ticketId}
+                  group={group}
+                  onNavigate={onNavigate}
+                />
+              ))}
             </div>
-            {openReviewGroups.map((group) => (
-              <OpenReviewItem key={group.ticketId} group={group} teamspaceTimeTrackingEnabled={teamspaceTimeTrackingEnabled} onNavigate={onNavigate} />
-            ))}
-            {openReviewGroups.length === 0 ? <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">Keine offenen Prüfungen.</p> : null}
-          </section>
-
-          <section className="space-y-2">
-            <div className="flex min-h-8 items-center gap-2 text-sm font-medium">
-              <Sparkles className="size-4 text-muted-foreground" />
-              Tage ohne Teamspace-Wert
-            </div>
-            {visibleMissingCrmDays.map((item) => (
-              <CrmDayItem
-                key={`${item.ticket_id}-${item.day}-missing`}
-                item={item}
-                busy={acknowledgingKeys.has(`${item.ticket_id}:${item.day}`)}
-                onSetAcknowledgement={setMissingCrmAcknowledgement}
-                onNavigate={onNavigate}
-              />
-            ))}
-            {visibleMissingCrmDays.length === 0 ? (
-              <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">
-                {acknowledgedMissingCrmDays.length > 0 ? "Alle offenen Punkte sind zur Kenntnis genommen." : "Alle abrechenbaren Tage haben einen Teamspace-Wert."}
-              </p>
-            ) : null}
-          </section>
+          ) : (
+            <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">
+              {acknowledgedMissingCrmDays.length > 0 && !showAcknowledgedMissingCrm
+                ? "Keine offenen Prüfpunkte. Zur Kenntnis genommene Tageswerte können eingeblendet werden."
+                : "Keine offenen Prüfpunkte für diesen Zeitraum."}
+            </p>
+          )}
         </CardContent>
       </Card>
 
-      <Accordion type="single" collapsible className="rounded-md border bg-card px-4">
-        <AccordionItem value="teamspace-entries" className="border-b-0">
-          <AccordionTrigger className="py-3 hover:no-underline">
-            <span className="flex min-w-0 flex-wrap items-center gap-2">
-              <span>Teamspace-Einträge</span>
-              <Badge variant="outline">{teamspaceDays.length} Eintrag(e)</Badge>
-            </span>
-          </AccordionTrigger>
-          <AccordionContent className="space-y-2 pb-4">
-            {teamspaceDays.length > 0 ? (
-              <div className="max-h-[28rem] space-y-2 overflow-y-auto pr-1">
-                {teamspaceDays.map((item) => (
-                  <TeamspaceDayItem key={`${item.ticket_id}-${item.day}`} item={item} onNavigate={onNavigate} />
-                ))}
-              </div>
-            ) : (
-              <p className="rounded-md border bg-muted/20 p-3 text-sm text-muted-foreground">Für {periodAttentionLabel} sind noch keine Teamspace-Werte zu abgerechneten Ticket-Tagen vorhanden.</p>
-            )}
-          </AccordionContent>
-        </AccordionItem>
-      </Accordion>
-
       {stats && stats.totals.sessions === 0 ? (
         <Card>
           <CardContent className="grid place-items-center gap-2 p-8 text-center">
diff --git a/frontend/src/views/ProfilePage.tsx b/frontend/src/views/ProfilePage.tsx
index 8fec0d8..92dd5b4 100644
--- a/frontend/src/views/ProfilePage.tsx
+++ b/frontend/src/views/ProfilePage.tsx
@@ -6,6 +6,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Input } from "@/components/ui/input";
 import { Switch } from "@/components/ui/switch";
 import { HelpLink } from "@/components/HelpLink";
+import { ListClockIcon } from "@/components/icons/ListClockIcon";
 import { getZammadSessionArticleQueue, retryZammadSessionArticleQueue, updateCurrentUser } from "../api";
 import { formatDateTime, formatMinutes } from "../format";
 import type { AuthUser, ZammadSessionArticleQueueItem } from "../types";
@@ -30,8 +31,10 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
   const [zammadEmailSessionWebhookEnabled, setZammadEmailSessionWebhookEnabled] = useState(currentUser.zammad_email_session_webhook_enabled);
   const [zammadAtossEmailSyncEnabled, setZammadAtossEmailSyncEnabled] = useState(currentUser.zammad_atoss_email_sync_enabled);
   const [sessionBillingPromptEnabled, setSessionBillingPromptEnabled] = useState(currentUser.session_billing_prompt_enabled);
+  const [sessionWorkSegmentsEnabled, setSessionWorkSegmentsEnabled] = useState(currentUser.session_work_segments_enabled);
   const [teamspaceTimeTrackingEnabled, setTeamspaceTimeTrackingEnabled] = useState(currentUser.teamspace_time_tracking_enabled ?? true);
   const [zammadSessionNoteDefaultEnabled, setZammadSessionNoteDefaultEnabled] = useState(currentUser.zammad_session_note_default_enabled);
+  const [zammadSessionNoteDateHeaderEnabled, setZammadSessionNoteDateHeaderEnabled] = useState(currentUser.zammad_session_note_date_header_enabled);
   const [zammadTimeUnitRoundingEnabled, setZammadTimeUnitRoundingEnabled] = useState(currentUser.zammad_time_unit_rounding_enabled);
   const [zammadTimeUnitRoundingMinutes, setZammadTimeUnitRoundingMinutes] = useState(currentUser.zammad_time_unit_rounding_minutes);
   const [zammadArticleTypeId, setZammadArticleTypeId] = useState<ZammadArticleTypeId>(currentUser.zammad_article_type_id ?? 6);
@@ -56,8 +59,10 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
     setZammadEmailSessionWebhookEnabled(currentUser.zammad_email_session_webhook_enabled);
     setZammadAtossEmailSyncEnabled(currentUser.zammad_atoss_email_sync_enabled);
     setSessionBillingPromptEnabled(currentUser.session_billing_prompt_enabled);
+    setSessionWorkSegmentsEnabled(currentUser.session_work_segments_enabled);
     setTeamspaceTimeTrackingEnabled(currentUser.teamspace_time_tracking_enabled ?? true);
     setZammadSessionNoteDefaultEnabled(currentUser.zammad_session_note_default_enabled);
+    setZammadSessionNoteDateHeaderEnabled(currentUser.zammad_session_note_date_header_enabled);
     setZammadTimeUnitRoundingEnabled(currentUser.zammad_time_unit_rounding_enabled);
     setZammadTimeUnitRoundingMinutes(currentUser.zammad_time_unit_rounding_minutes);
     setZammadArticleTypeId(currentUser.zammad_article_type_id ?? 6);
@@ -148,8 +153,10 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
           zammadEmailSessionWebhookEnabled,
           zammadAtossEmailSyncEnabled,
           sessionBillingPromptEnabled,
+          sessionWorkSegmentsEnabled,
           teamspaceTimeTrackingEnabled,
           zammadSessionNoteDefaultEnabled,
+          zammadSessionNoteDateHeaderEnabled,
           zammadTimeUnitRoundingEnabled,
           zammadTimeUnitRoundingMinutes,
           zammadArticleTypeId,
@@ -442,6 +449,22 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
                     onCheckedChange={setSessionBillingPromptEnabled}
                   />
                 </div>
+                <div className="mt-3 flex items-center justify-between gap-3 rounded-md border bg-background p-3">
+                  <div className="flex items-center gap-2">
+                    <ListClockIcon className="size-4 text-muted-foreground" />
+                    <div>
+                      <label className="text-sm font-medium" htmlFor="profile-session-work-segments">
+                        Arbeitsbereiche bei Pausen speichern
+                      </label>
+                      <p className="text-xs text-muted-foreground">Beim Pausieren und Fortsetzen die konkreten Von-bis-Zeiten an der Session merken.</p>
+                    </div>
+                  </div>
+                  <Switch
+                    id="profile-session-work-segments"
+                    checked={sessionWorkSegmentsEnabled}
+                    onCheckedChange={setSessionWorkSegmentsEnabled}
+                  />
+                </div>
                 <div className="mt-3 space-y-3 rounded-md border bg-background p-3">
                   <div className="flex items-center justify-between gap-3">
                     <div>
@@ -547,6 +570,24 @@ export function ProfilePage({ currentUser, onUserUpdated }: ProfilePageProps) {
                     }}
                   />
                 </div>
+                <div className="mt-3 rounded-md border bg-background p-3">
+                  <div className="flex items-center justify-between gap-3">
+                    <div className="flex items-center gap-2">
+                      <FileText className="size-4 text-muted-foreground" />
+                      <div>
+                        <label className="text-sm font-medium" htmlFor="profile-zammad-date-header">
+                          Datum bei nachgetragenen Sessions voranstellen
+                        </label>
+                        <p className="text-xs text-muted-foreground">Bei Einträgen vor heute wird nur in der Zammad-Notiz das Datum mit Leerzeile eingefügt.</p>
+                      </div>
+                    </div>
+                    <Switch
+                      id="profile-zammad-date-header"
+                      checked={zammadSessionNoteDateHeaderEnabled}
+                      onCheckedChange={setZammadSessionNoteDateHeaderEnabled}
+                    />
+                  </div>
+                </div>
                 {zammadSessionNoteDefaultEnabled ? (
                   <div className="mt-3 space-y-3">
                     <div className="rounded-md border bg-background p-3">
diff --git a/frontend/src/views/ProjectsPage.tsx b/frontend/src/views/ProjectsPage.tsx
index 8ce7bff..3fac842 100644
--- a/frontend/src/views/ProjectsPage.tsx
+++ b/frontend/src/views/ProjectsPage.tsx
@@ -95,6 +95,7 @@ const projectStaticFilterOptions: ProjectFilterOption[] = [
   { value: "open", label: "TT Offen" },
   { value: "closed", label: "TT Geschl." },
   { value: "hidden", label: "Ausgebl." },
+  { value: "teamspaceExcluded", label: "TS ausgenommen" },
   { value: "budgeted", label: "Mit Kontingent" },
   { value: "withoutBudget", label: "Ohne Kontingent" },
   { value: "remaining", label: "Mit Rest" },
@@ -499,6 +500,10 @@ function projectFilterGroup(filter: string) {
     return "visibility";
   }
 
+  if (filter === "teamspaceExcluded") {
+    return "teamspaceExclusion";
+  }
+
   if (filter.startsWith("zammadState:")) {
     return "zammadState";
   }
@@ -523,6 +528,10 @@ function matchesSingleProjectFilter(project: ProjectSummary, filter: string, sta
     return Boolean(project.hidden_for_user);
   }
 
+  if (filter === "teamspaceExcluded") {
+    return projectBudgetExcluded(project);
+  }
+
   if (filter.startsWith("zammadState:")) {
     return matchesZammadStateFilter(project.zammad_state_id, filter.slice("zammadState:".length) as Parameters<typeof matchesZammadStateFilter>[1]);
   }
@@ -558,6 +567,12 @@ function matchesProjectFilters(project: ProjectSummary, filters: string[], organ
     return false;
   }
 
+  const showTeamspaceExcluded = filters.includes("teamspaceExcluded");
+
+  if (projectBudgetExcluded(project) !== showTeamspaceExcluded) {
+    return false;
+  }
+
   return groupedProjectFilterMatch(filters, projectFilterGroup, (filter) => matchesSingleProjectFilter(project, filter, standardTeamspaceOnly));
 }
 
diff --git a/frontend/src/views/RecurringBillingsPage.tsx b/frontend/src/views/RecurringBillingsPage.tsx
index f17d42f..b8766c2 100644
--- a/frontend/src/views/RecurringBillingsPage.tsx
+++ b/frontend/src/views/RecurringBillingsPage.tsx
@@ -26,6 +26,9 @@ type RecurringFormState = {
   organizationName: string | null;
   activity: string;
   workType: WorkType;
+  teamspaceProject: string;
+  hourBudgetHours: string;
+  manualConsumptionHours: string;
   recurrenceType: "weekly" | "every_n_weeks";
   intervalValue: number;
   validFrom: string;
@@ -50,6 +53,9 @@ function emptyRecurringForm(): RecurringFormState {
     organizationName: null,
     activity: "",
     workType: "support",
+    teamspaceProject: "",
+    hourBudgetHours: "",
+    manualConsumptionHours: "",
     recurrenceType: "weekly",
     intervalValue: 1,
     validFrom: currentDay(),
@@ -118,6 +124,9 @@ export function RecurringBillingsPage() {
       organizationName: billing.organization_name,
       activity: billing.activity,
       workType: billing.work_type,
+      teamspaceProject: billing.teamspace_project ?? "",
+      hourBudgetHours: billing.hour_budget_minutes === null ? "" : durationHoursLabel(billing.hour_budget_minutes),
+      manualConsumptionHours: billing.manual_consumption_minutes > 0 ? durationHoursLabel(billing.manual_consumption_minutes) : "",
       recurrenceType: billing.recurrence_type,
       intervalValue: billing.recurrence_type === "weekly" ? 1 : billing.interval_value,
       validFrom: billing.valid_from,
@@ -162,8 +171,26 @@ export function RecurringBillingsPage() {
     }
 
     let slots: Array<{ id?: string; weekday: number | null; startTime: string; durationMinutes: number }>;
+    let hourBudgetMinutes: number | null;
+    let manualConsumptionMinutes: number;
 
     try {
+      const parseOptionalHours = (value: string, label: string) => {
+        if (!value.trim()) {
+          return null;
+        }
+
+        const hours = Number(value.replace(",", "."));
+
+        if (!Number.isFinite(hours) || hours < 0) {
+          throw new Error(`${label} prüfen`);
+        }
+
+        return Math.round(hours * 60);
+      };
+
+      hourBudgetMinutes = parseOptionalHours(recurringForm.hourBudgetHours, "Budget");
+      manualConsumptionMinutes = parseOptionalHours(recurringForm.manualConsumptionHours, "Manuelle Stunden") ?? 0;
       slots = recurringForm.slots.map((slot) => {
         const hours = Number(slot.durationHours.replace(",", "."));
 
@@ -191,6 +218,9 @@ export function RecurringBillingsPage() {
         organizationId: recurringForm.organizationId,
         activity: recurringForm.activity,
         workType: recurringForm.workType,
+        teamspaceProject: recurringForm.teamspaceProject.trim() || null,
+        hourBudgetMinutes,
+        manualConsumptionMinutes,
         recurrenceType: recurringForm.recurrenceType,
         intervalValue: recurringForm.recurrenceType === "weekly" ? 1 : recurringForm.intervalValue,
         validFrom: recurringForm.validFrom,
@@ -355,6 +385,44 @@ export function RecurringBillingsPage() {
               ) : null}
             </div>
 
+            <div className="grid gap-3 lg:grid-cols-[minmax(220px,1fr)_180px_180px]">
+              <div className="space-y-2">
+                <label className="text-sm font-medium" htmlFor="recurring-teamspace-project">
+                  TS-Projekt (optional)
+                </label>
+                <Input
+                  id="recurring-teamspace-project"
+                  value={recurringForm.teamspaceProject}
+                  onChange={(event) => setRecurringForm({ ...recurringForm, teamspaceProject: event.currentTarget.value })}
+                  placeholder="Teamspace-Projekt"
+                />
+              </div>
+              <div className="space-y-2">
+                <label className="text-sm font-medium" htmlFor="recurring-budget-hours">
+                  Budget in Stunden (optional)
+                </label>
+                <Input
+                  id="recurring-budget-hours"
+                  inputMode="decimal"
+                  value={recurringForm.hourBudgetHours}
+                  onChange={(event) => setRecurringForm({ ...recurringForm, hourBudgetHours: event.currentTarget.value })}
+                  placeholder="z. B. 20"
+                />
+              </div>
+              <div className="space-y-2">
+                <label className="text-sm font-medium" htmlFor="recurring-manual-hours">
+                  Manuelle Stunden (optional)
+                </label>
+                <Input
+                  id="recurring-manual-hours"
+                  inputMode="decimal"
+                  value={recurringForm.manualConsumptionHours}
+                  onChange={(event) => setRecurringForm({ ...recurringForm, manualConsumptionHours: event.currentTarget.value })}
+                  placeholder="z. B. 2,5"
+                />
+              </div>
+            </div>
+
             <div className="space-y-2">
               <label className="text-sm font-medium" htmlFor="recurring-activity">
                 Tätigkeit
@@ -473,6 +541,9 @@ export function RecurringBillingsPage() {
                   {billing.valid_until ? ` bis ${formatDateLabel(billing.valid_until)}` : ""}
                 </p>
                 <div className="mt-1 flex flex-wrap gap-1">
+                  {billing.teamspace_project ? <Badge variant="secondary">TS {billing.teamspace_project}</Badge> : null}
+                  {billing.hour_budget_minutes !== null ? <Badge variant="outline">Budget {formatMinutes(billing.hour_budget_minutes)}</Badge> : null}
+                  {billing.manual_consumption_minutes > 0 ? <Badge variant="outline">Manuell {formatMinutes(billing.manual_consumption_minutes)}</Badge> : null}
                   {billing.slots.map((slot) => (
                     <Badge key={slot.id} variant="outline">
                       {slot.weekday === null ? "Starttag" : weekdays.find((weekday) => weekday.value === slot.weekday)?.label} · {slot.start_time?.slice(0, 5)} · {formatMinutes(slot.duration_minutes)}
diff --git a/frontend/src/views/StatisticsPage.tsx b/frontend/src/views/StatisticsPage.tsx
index 7d518fe..4710011 100644
--- a/frontend/src/views/StatisticsPage.tsx
+++ b/frontend/src/views/StatisticsPage.tsx
@@ -147,21 +147,21 @@ function DeltaBadge({ minutes }: { minutes: number }) {
 
 function deltaDescription(minutes: number) {
   if (minutes > 0) {
-    return "Teamspace liegt über der abgerechneten Zeit";
+    return "TT-Teamspace liegt über der Session-Zeit";
   }
 
   if (minutes < 0) {
-    return "Teamspace liegt unter der abgerechneten Zeit";
+    return "TT-Teamspace liegt unter der Session-Zeit";
   }
 
-  return "Teamspace und abgerechnete Zeit sind ausgeglichen";
+  return "TT-Teamspace und Session-Zeit sind ausgeglichen";
 }
 
 function TimeComparison({ trackedMinutes, crmMinutes, sessions }: { trackedMinutes: number; crmMinutes: number; sessions?: number }) {
   return (
     <div className="space-y-0.5 text-sm">
-      <div className={`font-semibold ${trackedTextClass}`}>Abgerechnet {formatMinutes(trackedMinutes)}</div>
-      <div className={`font-semibold ${teamspaceTextClass}`}>Teamspace {formatMinutes(crmMinutes)}</div>
+      <div className={`font-semibold ${trackedTextClass}`}>Session-Zeit {formatMinutes(trackedMinutes)}</div>
+      <div className={`font-semibold ${teamspaceTextClass}`}>TT-Teamspace {formatMinutes(crmMinutes)}</div>
       {typeof sessions === "number" ? <div className="text-xs text-muted-foreground">{sessions} Session(s)</div> : null}
     </div>
   );
@@ -176,7 +176,7 @@ function ColorLegend({ showDifference = true }: { showDifference?: boolean }) {
       </span>
       <span className="inline-flex items-center gap-1.5">
         <span className={`h-0.5 w-4 ${teamspaceDotClass}`} />
-        <span className={teamspaceTextClass}>Teamspace</span>
+        <span className={teamspaceTextClass}>TT-Teamspace</span>
       </span>
       <span className="inline-flex items-center gap-1.5">
         <span className="size-2 rounded-sm bg-slate-500 dark:bg-slate-400" />
@@ -433,7 +433,7 @@ function TicketHotspot({
         <p className="truncate text-sm text-muted-foreground">{ticket.organization_name ?? "Keine Organisation"}</p>
         <div className="mt-1 flex flex-wrap gap-x-3 gap-y-1 text-xs">
           <span className={trackedTextClass}>Abgerechnet {formatMinutes(ticket.total_minutes)}</span>
-          <span className={teamspaceTextClass}>Teamspace {formatMinutes(ticket.crm_billed_minutes)}</span>
+          <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(ticket.crm_billed_minutes)}</span>
           <span className="text-muted-foreground">{ticket.billed_sessions} abgerechnet</span>
           <span className="text-muted-foreground">{ticket.billable_sessions} abrechenbar</span>
           <span>{ticket.active_days} Tag(e)</span>
@@ -653,7 +653,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
           <h2 className="text-2xl font-semibold tracking-normal">Statistiken</h2>
 	          <p className="text-sm text-muted-foreground">
 	            {teamspaceTimeTrackingEnabled
-	              ? "Monatswerte, Teamspace-Abgleich, Organisationen und offene Nacharbeit."
+	              ? "Monatswerte, TT-Teamspace-Abgleich, Organisationen und offene Nacharbeit."
 	              : "Monatswerte, Session-Status, Organisationen und Teamspace-Istwerte."}
 	          </p>
         </div>
@@ -702,7 +702,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
           helpLabel="Hilfe zu Bewertungen"
         />
         <MetricCard
-          label="Teamspace"
+          label="TT-Teamspace"
           value={formatMinutes(totals?.crmBilledMinutes ?? 0)}
 	          detail={teamspaceTimeTrackingEnabled
 	            ? <span className={deltaTextClass(totals?.crmDeltaMinutes ?? 0)}>Differenz {formatTeamspaceDelta(totals?.crmDeltaMinutes ?? 0)}</span>
@@ -734,12 +734,12 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
             <CardTitle>Monatsverlauf und Abrechnungsqualität</CardTitle>
 	            <CardDescription>
 	              {teamspaceTimeTrackingEnabled
-	                ? "Abgerechnete Zeit pro Tag, Teamspace-Linie und Bewertungsstand in einem Überblick."
+		                ? "Abgerechnete Zeit pro Tag, TT-Teamspace-Linie und Bewertungsstand in einem Überblick."
 	                : "Abgerechnete Zeit pro Tag und Bewertungsstand in einem Überblick."}
 	            </CardDescription>
           </div>
           <div className="flex items-center gap-2">
-	            {teamspaceTimeTrackingEnabled ? <Badge variant="outline">{crmCoverage}% Teamspace-Abdeckung</Badge> : <Badge variant="outline">Teamspace als Ist-Quelle</Badge>}
+	            {teamspaceTimeTrackingEnabled ? <Badge variant="outline">{crmCoverage}% TT-Teamspace-Abdeckung</Badge> : <Badge variant="outline">Teamspace als Ist-Quelle</Badge>}
             <HelpLink anchor="statistik-verlauf" label="Hilfe zu Monatsverlauf und Abrechnungsqualität" />
           </div>
         </CardHeader>
@@ -768,13 +768,13 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
 	              <div className="space-y-2 rounded-md border bg-muted/20 p-3">
 	                <div className="flex items-start justify-between gap-3">
 	                  <div>
-	                    <p className="text-sm font-medium">Teamspace-Abgleich</p>
+	                    <p className="text-sm font-medium">TT-Teamspace-Abgleich</p>
 	                    <p className="text-xs text-muted-foreground">{deltaDescription(totals?.crmDeltaMinutes ?? 0)}</p>
 	                  </div>
 	                  <DeltaBadge minutes={totals?.crmDeltaMinutes ?? 0} />
 	                </div>
 	                <TimeComparison trackedMinutes={totals?.minutes ?? 0} crmMinutes={totals?.crmBilledMinutes ?? 0} sessions={totals?.billedSessions ?? 0} />
-	                <div className="text-xs text-muted-foreground">Teamspace-Abdeckung: {crmCoverage}% der abgerechneten Zeit</div>
+	                <div className="text-xs text-muted-foreground">TT-Teamspace-Abdeckung: {crmCoverage}% der Session-Zeit</div>
 	              </div>
 	            ) : (
 	              <div className="space-y-2 rounded-md border bg-muted/20 p-3">
@@ -812,7 +812,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
                 <p className="truncate font-semibold">{topOrganization.organization_name}</p>
                 <p className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
                   <span className={trackedTextClass}>Abgerechnet {formatMinutes(topOrganization.total_minutes)}</span>
-                  <span className={teamspaceTextClass}>Teamspace {formatMinutes(topOrganization.crm_billed_minutes)}</span>
+                  <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(topOrganization.crm_billed_minutes)}</span>
                 </p>
               </div>
             ) : null}
@@ -879,7 +879,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
                   <Progress value={percentage(organization.total_minutes, maxOrganizationMinutes)} />
                   <div className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
                     <span className={trackedTextClass}>Abgerechnet {formatMinutes(organization.total_minutes)}</span>
-                    <span className={teamspaceTextClass}>Teamspace {formatMinutes(organization.crm_billed_minutes)}</span>
+                    <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(organization.crm_billed_minutes)}</span>
                     <span className="text-muted-foreground">{percentage(organization.total_minutes, totals?.minutes ?? 0)}% vom Monat</span>
 	                    {teamspaceTimeTrackingEnabled ? <span className={deltaTextClass(organization.crm_delta_minutes)}>{formatTeamspaceDelta(organization.crm_delta_minutes)}</span> : null}
                   </div>
@@ -948,7 +948,7 @@ export function StatisticsPage({ currentUser, onNavigate }: StatisticsPageProps)
                 <Progress value={percentage(group.total_minutes, totals?.minutes ?? 0)} />
                 <div className="flex flex-wrap gap-x-3 gap-y-1 text-xs">
                   <span className={trackedTextClass}>Abgerechnet {formatMinutes(group.total_minutes)}</span>
-                  <span className={teamspaceTextClass}>Teamspace {formatMinutes(group.crm_billed_minutes)}</span>
+                  <span className={teamspaceTextClass}>TT-Teamspace {formatMinutes(group.crm_billed_minutes)}</span>
                 </div>
                 <div className="grid gap-2 text-xs text-muted-foreground sm:grid-cols-3">
                   <span>Abr. {group.billed_sessions} / {formatMinutes(group.billed_minutes)}</span>
diff --git a/frontend/src/views/TicketDetailPage.tsx b/frontend/src/views/TicketDetailPage.tsx
index ee84ef4..9bd9876 100644
--- a/frontend/src/views/TicketDetailPage.tsx
+++ b/frontend/src/views/TicketDetailPage.tsx
@@ -12,10 +12,12 @@ import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { CopyTicketButton } from "@/components/CopyTicketButton";
 import { HelpLink } from "@/components/HelpLink";
+import { ListClockIcon } from "@/components/icons/ListClockIcon";
 import { OrganizationSelect } from "@/components/OrganizationSelect";
 import { readRichActivityEditorValue, RichActivityEditor } from "@/components/RichActivityEditor";
 import { TodoPanel } from "@/components/TodoPanel";
 import {
+  acknowledgeMissingTicketDayBilling,
   acknowledgeProjectReview,
   createSession,
   deleteProject,
@@ -34,6 +36,7 @@ import {
   updateSessionBilling,
   updateSessionDetails,
   updateTicket,
+  updateTicketAtossSupport,
   updateTicketDayBilling,
   updateProject,
   updateProjectStatus
@@ -41,7 +44,7 @@ import {
 import type { CreateSessionResult, TicketZammadMailSessionItem, TicketZammadMailSessionResult } from "../api";
 import { currentDay, currentMonth, formatDate, formatDateTime, formatMinutes, formatTimeRange } from "../format";
 import { ticketHasRecurringBilling } from "../recurring-billings";
-import type { AuthUser, BillingStatus, PeriodType, ProjectSummary, ProjectTeamspaceEntry, ProjectTeamspaceSubentry, SessionEntry, TicketDetailPeriodType, TicketPeriod, WorkType } from "../types";
+import type { AuthUser, BillingStatus, PeriodType, ProjectSummary, ProjectTeamspaceEntry, ProjectTeamspaceSubentry, SessionEntry, TicketDetailPeriodType, TicketPeriod, TicketTeamspaceDay, WorkType } from "../types";
 import { ZammadPriorityBadge, ZammadStateBadge } from "../zammad-meta";
 import { zammadArticleTypeFromValue, zammadArticleTypeLabel, zammadArticleTypeOptions, zammadArticleTypeValue, type ZammadArticleTypeId } from "../zammad-article-types";
 import { getLocalStorageValue, setLocalStorageValue } from "@/lib/local-storage.client";
@@ -152,6 +155,20 @@ function formatSignedMinutes(minutes: number) {
   return `${minutes > 0 ? "+" : "-"}${formatMinutes(Math.abs(minutes))}`;
 }
 
+function formatSegmentClock(value: string) {
+  const date = new Date(value);
+
+  if (Number.isNaN(date.getTime())) {
+    return "--:--";
+  }
+
+  return date.toLocaleTimeString("de-DE", { hour: "2-digit", minute: "2-digit" });
+}
+
+function formatWorkSegmentRange(segment: SessionEntry["work_segments"][number]) {
+  return `${formatSegmentClock(segment.startedAt)} - ${segment.endedAt ? formatSegmentClock(segment.endedAt) : "läuft"}`;
+}
+
 function formatTeamspaceMissingTarget(minutes: number, teamspaceTimeTrackingEnabled: boolean) {
   if (minutes === 0) {
     return "ausgeglichen";
@@ -958,6 +975,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
   const [loadingId, setLoadingId] = useState<string | null>(null);
   const [deletingId, setDeletingId] = useState<string | null>(null);
   const [savingTicket, setSavingTicket] = useState(false);
+  const [savingAtossSupport, setSavingAtossSupport] = useState(false);
   const [savingFavorite, setSavingFavorite] = useState(false);
   const [isFavorite, setIsFavorite] = useState(false);
   const [editTicketNumber, setEditTicketNumber] = useState("");
@@ -980,6 +998,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
   const [sendingZammadSessionId, setSendingZammadSessionId] = useState<string | null>(null);
   const [dayBillingInputs, setDayBillingInputs] = useState<Record<string, string>>({});
   const [savingDayBillingKey, setSavingDayBillingKey] = useState<string | null>(null);
+  const [acknowledgingTeamspaceDay, setAcknowledgingTeamspaceDay] = useState<string | null>(null);
   const [selectedTeamspaceEntryId, setSelectedTeamspaceEntryId] = useState<string | null>(null);
   const [ticketSession, setTicketSession] = useState<TicketSessionFormState>(() => emptyTicketSessionForm());
   const [savingTicketSession, setSavingTicketSession] = useState(false);
@@ -1042,6 +1061,24 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     }
   }
 
+  async function setMissingTeamspaceDayAcknowledgement(day: TicketTeamspaceDay, acknowledged: boolean) {
+    setAcknowledgingTeamspaceDay(day.day);
+
+    try {
+      await acknowledgeMissingTicketDayBilling(ticketId, day.day, acknowledged);
+      toast.success(acknowledged ? "Teamspace-Prüfung abgehakt" : "Kenntnisnahme zurückgenommen", {
+        description: formatDate(`${day.day}T00:00:00`)
+      });
+      await load();
+    } catch (error) {
+      toast.error(acknowledged ? "Konnte nicht abgehakt werden" : "Konnte nicht zurückgenommen werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setAcknowledgingTeamspaceDay(null);
+    }
+  }
+
   useEffect(() => {
     void load();
   }, [periodType, period, ticketId, globalMonthFilter, globalStatusFilter, globalSourceFilter]);
@@ -1127,6 +1164,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 
   const ticket = data?.ticket;
   const project = data?.project ?? null;
+  const ticketSessionEffectiveWorkType = ticket?.organization_id && ticket.work_type ? ticket.work_type : ticketSession.workType;
   const isRecurringBillingTicket = ticketHasRecurringBilling(ticket);
   const projectDescription = project ? combinedProjectDescription(project) : "";
   const projectEntries = useMemo(() => (project ? projectTeamspaceEntries(project) : []), [project]);
@@ -1173,10 +1211,10 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 
   const hasMultipleProjectTeamspaceEntries = projectEntries.length > 1;
   const hasProjectTeamspaceApiIds = projectEntries.some((entry) => Boolean(entry.teamspace_api_project_id));
-	  const showTeamspaceSubentryCard = Boolean(project && hasProjectTeamspaceApiIds);
+	  const showTeamspaceSubentryCard = false;
 	  const usesTeamspaceSubentries = false;
   const budgetExcluded = project ? projectBudgetExcluded(project) : false;
-  const budgetConsumptionExcluded = budgetExcluded || isRecurringBillingTicket;
+  const budgetConsumptionExcluded = budgetExcluded;
 	  const showBudgetedProjectEntries = budgetedProjectEntries.length > 1;
 	  const requiresProjectTeamspaceEntry = Boolean(project && hasMultipleProjectTeamspaceEntries);
   const teamspaceTimeTrackingEnabled = currentUser.teamspace_time_tracking_enabled ?? true;
@@ -1196,7 +1234,13 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     || project?.owner_username
     || (project?.zammad_owner_id ? `Zammad-Owner ${project.zammad_owner_id}` : null)
     || zammadOwnerLabel;
-  const currentZammadUserLabel = currentUser.zammad_user_id ? `Zammad-User ${currentUser.zammad_user_id}` : "dein Zammad-User";
+  const canChooseAtossSupportFallback = Boolean(
+    ticket?.work_type === "support"
+    && !isRecurringBillingTicket
+    && !project
+    && !ticket.teamspace_assignment_rule_id
+    && !ticket.teamspace_assignment_project
+  );
   const isProject = Boolean(project);
   const isGlobalTicket = periodType === "all";
   const isPeriodClosed = Boolean(data?.closed);
@@ -1217,7 +1261,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
       ? "im gesamten Ticketverlauf"
       : `im Monat ${globalMonthFilter}`
     : `im ${periodLabel.toLowerCase()} ${period}`;
-  const teamspaceLabel = isGlobalTicket || periodType === "month" ? "Teamspace gesamt" : "Teamspace Tag";
+  const teamspaceLabel = isGlobalTicket || periodType === "month" ? "Für Teamspace gesamt" : "Für Teamspace Tag";
   const availableMonths = data?.availableMonths ?? [];
   const selectedMonthHasSessions = availableMonths.some((month) => month.month === globalMonthFilter);
   const defaultProjectEntryId = projectEntries.find((entry) => entry.is_default)?.id ?? null;
@@ -1272,12 +1316,28 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 
     return billingMap;
   }, [teamspaceMonthActuals]);
+  const ticketTeamspaceDayByDayMap = useMemo(
+    () => new Map((data?.ticketTeamspaceDays ?? []).map((day) => [day.day, day])),
+    [data?.ticketTeamspaceDays]
+  );
   const teamspaceDayDeviation = (day: string) => {
+    const ticketComparison = ticketTeamspaceDayByDayMap.get(day);
+
+    if (ticketComparison) {
+      return {
+        ttMinutes: Number(ticketComparison.tracked_minutes ?? 0),
+        tsMinutes: Number(ticketComparison.crm_billed_minutes ?? 0),
+        deltaMinutes: Number(ticketComparison.delta_minutes ?? 0),
+        comparison: ticketComparison
+      };
+    }
+
     if (!project || ticket?.work_type === "support" || budgetExcluded) {
       return {
         ttMinutes: 0,
         tsMinutes: 0,
-        deltaMinutes: 0
+        deltaMinutes: 0,
+        comparison: null
       };
     }
 
@@ -1287,7 +1347,8 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     return {
       ttMinutes,
       tsMinutes,
-      deltaMinutes: tsMinutes - ttMinutes
+      deltaMinutes: tsMinutes - ttMinutes,
+      comparison: null
     };
   };
 	  const unassignedTeamspaceSessions = useMemo(
@@ -1397,13 +1458,36 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
       });
     }
 
+    for (const comparison of data?.ticketTeamspaceDays ?? []) {
+      const hasAttention = Number(comparison.delta_minutes ?? 0) !== 0
+        || comparison.tt_value_without_billed_session
+        || comparison.missing_tt_value;
+
+      if (!hasAttention || Array.from(groups.values()).some((group) => group.day === comparison.day)) {
+        continue;
+      }
+
+      const key = teamspaceBillingKey(comparison.day, null);
+      groups.set(key, {
+        key,
+        day: comparison.day,
+        projectTeamspaceEntryId: null,
+        label: formatDate(`${comparison.day}T00:00:00`),
+        totalMinutes: 0,
+        billableMinutes: 0,
+        nonBillableMinutes: 0,
+        openMinutes: 0,
+        sessions: []
+      });
+    }
+
     return Array.from(groups.values())
       .map((group) => ({
         ...group,
         sessions: [...group.sessions].sort((left, right) => new Date(right.started_at).getTime() - new Date(left.started_at).getTime())
       }))
       .sort((left, right) => right.key.localeCompare(left.key));
-	  }, [activeTeamspaceEntryId, data?.sessions, projectEntries, usesTeamspaceEntryTabs, usesTeamspaceSubentries]);
+	  }, [activeTeamspaceEntryId, data?.sessions, data?.ticketTeamspaceDays, projectEntries, usesTeamspaceEntryTabs, usesTeamspaceSubentries]);
 	  const sessionIds = useMemo(() => sessionGroups.flatMap((group) => group.sessions.map((session) => session.id)), [sessionGroups]);
 	  const allSessionsExpanded = sessionIds.length > 0 && sessionIds.every((sessionId) => expandedSessionIds.includes(sessionId));
 	  const periodTotalMinutes = sessionGroups.reduce((sum, group) => sum + group.totalMinutes, 0);
@@ -1697,6 +1781,29 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
     }
   }
 
+  async function setTicketAtossSupport(enabled: boolean) {
+    if (!ticket || ticket.work_type !== "support" || ticket.can_manage_atoss_support !== true) {
+      return;
+    }
+
+    setSavingAtossSupport(true);
+    try {
+      await updateTicketAtossSupport(ticket.id, enabled);
+      toast.success(enabled ? "Atoss-Support-Fallback aktiviert" : "Atoss-Support-Fallback deaktiviert", {
+        description: enabled
+          ? "Der Fallback greift nur, wenn weder ein Projekt noch eine Zuordnungsregel vorhanden ist."
+          : "Ohne Projekt oder Regel bleibt das Ticket künftig unzugeordnet."
+      });
+      await load();
+    } catch (error) {
+      toast.error("Atoss-Support-Fallback konnte nicht gespeichert werden", {
+        description: error instanceof Error ? error.message : "Unbekannter Fehler"
+      });
+    } finally {
+      setSavingAtossSupport(false);
+    }
+  }
+
   function openProjectEditor() {
     if (!project) {
       return;
@@ -1946,6 +2053,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
         projectTeamspaceEntryId: effectiveWorkType === "consulting" && requiresProjectTeamspaceEntry ? ticketSession.projectTeamspaceEntryId : null,
         billingStatus: ticketSession.billingStatus,
         createZammadArticle: ticketSession.createZammadArticle && hasActivityContent(activityValue.activity, activityValue.zammadArticleBody),
+        zammadArticleDateHeader: true,
         zammadArticleTypeId: ticketSession.zammadArticleTypeId
       });
       toast.success("Session nachgetragen", {
@@ -2235,50 +2343,35 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
         </Alert>
       ) : null}
 
-      {ticket?.is_foreign_zammad_owner ? (
-        <Alert className="py-3 text-sm">
-          <AlertCircle className="size-4" />
-          <AlertTitle>Anderer Zammad-Owner</AlertTitle>
-          <AlertDescription>
-            Dieses Ticket gehört in Zammad {zammadOwnerLabel ? `${zammadOwnerLabel}` : "einem anderen Owner"}; du bist {currentZammadUserLabel}. Du kannst deine Sessions sehen, Projekt- und Ticketdaten sind für dich geschützt.
-          </AlertDescription>
-        </Alert>
-      ) : null}
-
-      {ticketManagedByZammad ? (
-        <Alert className="py-3 text-sm">
-          <AlertCircle className="size-4" />
-          <AlertTitle>Ticketdaten werden von Zammad verwaltet</AlertTitle>
-          <AlertDescription>
-            Nummer, Art, Titel und Organisation wurden durch den Zammad-Sync übernommen und können in TicketTracker nicht manuell geändert werden.
-          </AlertDescription>
-        </Alert>
-      ) : null}
-
       <div className="grid gap-4">
         <Card>
-          <CardHeader className="p-4 pb-2">
+          <CardHeader className="p-3 pb-2">
             <div className="flex items-start justify-between gap-3">
-              <div>
-                <CardTitle>Ticketdaten</CardTitle>
-                <CardDescription>
-                  {canEditTicketData
-                    ? "Änderungen an Organisation und Art werden auf alle vorhandenen Sessions dieses Tickets übernommen."
-                    : ticketManagedByZammad
-                      ? "Nummer, Art, Titel und Organisation kommen aus Zammad und sind lokal gesperrt."
-                      : "Nur der Owner kann Ticketdaten ändern."}
-                </CardDescription>
-              </div>
+              <CardTitle className="flex min-w-0 flex-wrap items-center gap-2">
+                Ticketdaten
+                {ticket?.is_foreign_zammad_owner ? (
+                  <Badge variant="warning" title={zammadOwnerLabel ? `Zammad-Owner: ${zammadOwnerLabel}` : "Anderer Zammad-Owner"}>Fremder Zammad-Owner</Badge>
+                ) : null}
+                {ticketManagedByZammad ? <Badge variant="secondary">Zammad-verwaltet</Badge> : null}
+                {isRecurringBillingTicket ? <Badge variant="secondary">Fixabrechnung</Badge> : null}
+                {ticket?.teamspace_assignment_project ? (
+                  <Badge variant="success" title={ticket.teamspace_assignment_rule_name ?? "Automatische Zuordnung"}>
+                    TS automatisch: {ticket.teamspace_assignment_project}
+                  </Badge>
+                ) : null}
+                {canChooseAtossSupportFallback && ticket?.atoss_support ? <Badge variant="secondary">Atoss-Fallback</Badge> : null}
+                {canChooseAtossSupportFallback && !ticket?.atoss_support ? <Badge variant="warning">Keine TS-Zuordnung</Badge> : null}
+              </CardTitle>
               <HelpLink anchor="ticketdaten" label="Hilfe zu Ticketdaten" />
             </div>
           </CardHeader>
-          <CardContent className="px-4 pb-3">
-            <form className="grid gap-3 md:grid-cols-2 xl:grid-cols-[140px_145px_minmax(220px,1fr)_minmax(240px,1.2fr)_150px] xl:items-end" onSubmit={saveTicketData}>
-              <div className="space-y-2">
+          <CardContent className="px-3 pb-3">
+            <form className="grid gap-2 md:grid-cols-2 xl:grid-cols-[140px_145px_minmax(220px,1fr)_minmax(240px,1.2fr)_150px] xl:items-end" onSubmit={saveTicketData}>
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-number">Ticketnummer</label>
                 <Input id="edit-ticket-number" value={editTicketNumber} disabled={!canEditTicketData} onChange={(event) => setEditTicketNumber(event.currentTarget.value)} required />
               </div>
-              <div className="space-y-2">
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-work-type">Art</label>
                 <select
                   id="edit-ticket-work-type"
@@ -2291,11 +2384,11 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   <option value="consulting">Consulting</option>
                 </select>
               </div>
-              <div className="space-y-2">
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-title">Titel</label>
                 <Input id="edit-ticket-title" value={editTicketTitle} disabled={!canEditTicketData} onChange={(event) => setEditTicketTitle(event.currentTarget.value)} placeholder="optional" />
               </div>
-              <div className="space-y-2">
+              <div className="space-y-1">
                 <label className="text-sm font-medium" htmlFor="edit-ticket-organization">Organisation</label>
                 {ticket?.customer_name && !ticket.organization_id ? (
                   <p className="text-xs text-muted-foreground">Bisheriger Freitext: {ticket.customer_name}</p>
@@ -2316,6 +2409,17 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                 {savingTicket ? "Speichert..." : "Speichern"}
               </Button>
             </form>
+            {canChooseAtossSupportFallback ? (
+              <div className="mt-2 flex items-center gap-2 rounded-md border bg-muted/20 px-2.5 py-2">
+                <Checkbox
+                  id="ticket-atoss-support"
+                  checked={Boolean(ticket?.atoss_support)}
+                  disabled={ticket?.can_manage_atoss_support !== true || savingAtossSupport}
+                  onCheckedChange={(checked) => void setTicketAtossSupport(checked === true)}
+                />
+                <label className="text-sm font-medium" htmlFor="ticket-atoss-support">Atoss-Support-Fallback</label>
+              </div>
+            ) : null}
           </CardContent>
         </Card>
       </div>
@@ -2332,13 +2436,13 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   {project.closed_at ? <Badge variant="secondary">Geschlossen</Badge> : <Badge variant="success">Offen</Badge>}
                   <ZammadStateBadge stateId={project.zammad_state_id} />
                   <ZammadPriorityBadge priorityId={project.zammad_priority_id} />
-                  {!canEditProject ? <Badge variant="outline">geteilt</Badge> : null}
+                  {!canEditProject ? <Badge variant="outline">{isRecurringBillingTicket ? "Fixabrechnung" : "geteilt"}</Badge> : null}
                   {project.close_review_required ? <Badge variant="warning">TS/TT prüfen</Badge> : null}
                   {unassignedTeamspaceEntryCount > 0 ? <Badge variant="warning">{unassignedTeamspaceEntryCount} ohne TS</Badge> : null}
                   {unassignedTeamspaceSubentryCount > 0 ? <Badge variant="warning">{unassignedTeamspaceSubentryCount} ohne Pos.</Badge> : null}
                 </CardTitle>
                 <CardDescription>
-                  {!canEditProject && projectOwnerLabel
+                  {!canEditProject && !isRecurringBillingTicket && projectOwnerLabel
                     ? `Eigentümer: ${projectOwnerLabel}`
                     : showBudgetedProjectEntries
                       ? `${budgetedProjectEntries.length} budgetierte Teamspace-Einträge`
@@ -2346,20 +2450,24 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                 </CardDescription>
               </div>
               <div className="flex shrink-0 items-center gap-1">
-                <Button
-                  type="button"
-                  size="sm"
-                  variant="secondary"
-                  disabled={!canEditProject || savingProjectStatus}
-                  onClick={() => void setProjectClosed(!project.closed_at)}
-                >
-                  {project.closed_at ? <RotateCcw className="size-4" /> : <CheckCircle2 className="size-4" />}
-                  {project.closed_at ? "Öffnen" : "Schließen"}
-                </Button>
-                <Button type="button" size="sm" variant="secondary" disabled={!canEditProject} onClick={openProjectEditor}>
-                  <Pencil className="size-4" />
-                  Bearbeiten
-                </Button>
+                {!isRecurringBillingTicket ? (
+                  <>
+                    <Button
+                      type="button"
+                      size="sm"
+                      variant="secondary"
+                      disabled={!canEditProject || savingProjectStatus}
+                      onClick={() => void setProjectClosed(!project.closed_at)}
+                    >
+                      {project.closed_at ? <RotateCcw className="size-4" /> : <CheckCircle2 className="size-4" />}
+                      {project.closed_at ? "Öffnen" : "Schließen"}
+                    </Button>
+                    <Button type="button" size="sm" variant="secondary" disabled={!canEditProject} onClick={openProjectEditor}>
+                      <Pencil className="size-4" />
+                      Bearbeiten
+                    </Button>
+                  </>
+                ) : null}
                 <HelpLink anchor="projekte" label="Hilfe zu Projekten" />
               </div>
             </div>
@@ -2407,6 +2515,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
               <Badge variant="secondary">Zeitraum {project.starts_on || "offen"} - {project.ends_on || "offen"}</Badge>
               {budgetConsumptionExcluded ? <Badge variant="outline">Budgetprüfung ausgenommen</Badge> : <Badge variant="secondary">Kontingent {projectBudgetMinutes ? formatMinutes(projectBudgetMinutes) : "offen"}</Badge>}
               <Badge variant="secondary">Verbrauch {formatMinutes(projectConsumptionMinutes)}</Badge>
+              {project.manual_consumption_minutes > 0 ? <Badge variant="outline">Manuell {formatMinutes(project.manual_consumption_minutes)}</Badge> : null}
               {budgetConsumptionExcluded ? null : <Badge variant={projectRemainingMinutes !== null && projectRemainingMinutes < 0 ? "destructive" : "secondary"}>{projectRemainingLabel(projectRemainingMinutes)}</Badge>}
               {!budgetConsumptionExcluded && showBudgetedProjectEntries ? <Badge variant="outline">{budgetedProjectEntries.length} Budgets</Badge> : null}
             </div>
@@ -2416,9 +2525,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                   <Info className="size-4" />
                   <AlertTitle>Budgetverbrauch nicht auswertbar</AlertTitle>
                   <AlertDescription>
-                    {budgetExcluded
-                      ? "Dieses Teamspace-Projekt ist systemweit von Differenz- und Budgetprüfung ausgenommen. Der Verbrauch zählt weiter in Summen."
-                      : "Dieses Projekt ist eine Fixabrechnung. Der Verbrauch zählt weiter in Summen."}
+                    Dieses Teamspace-Projekt ist systemweit von Differenz- und Budgetprüfung ausgenommen. Der Verbrauch zählt weiter in Summen.
                   </AlertDescription>
                 </Alert>
               ) : (
@@ -2591,16 +2698,22 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
         </Dialog>
 
         <Card>
-          <CardHeader className="p-4">
+          <CardHeader className="p-3 pb-2">
             <div className="flex items-start justify-between gap-3">
-              <div>
-                <CardTitle className="flex items-center gap-2">
-                  <ClipboardList className="size-5 text-muted-foreground" />
-                  ToDos
-                </CardTitle>
-                <CardDescription>Aufgaben zu diesem Ticket oder Projekt verwalten.</CardDescription>
-              </div>
-              <div className="flex shrink-0 items-center gap-2">
+              <CardTitle className="flex items-center gap-2">
+                <ClipboardList className="size-4 text-muted-foreground" />
+                ToDos
+              </CardTitle>
+              <HelpLink anchor="todos" label="Hilfe zu ToDos" />
+            </div>
+          </CardHeader>
+          <CardContent className="px-3 pb-3">
+            <TodoPanel
+              ticketId={ticket?.id}
+              todos={visibleTodos}
+              onChanged={load}
+              compact
+              toolbar={(
                 <div className="flex rounded-md border bg-muted/20 p-0.5">
                   {(["open", "all", "done"] as const).map((value) => (
                     <Button
@@ -2615,12 +2728,8 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                     </Button>
                   ))}
                 </div>
-                <HelpLink anchor="todos" label="Hilfe zu ToDos" />
-              </div>
-            </div>
-          </CardHeader>
-          <CardContent className="px-4 pb-4">
-            <TodoPanel ticketId={ticket?.id} todos={visibleTodos} onChanged={load} />
+              )}
+            />
           </CardContent>
         </Card>
       </div>
@@ -2839,7 +2948,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
           </div>
           <div className="flex flex-wrap items-center gap-2">
             <div className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2 text-sm">
-              <span className="text-muted-foreground">Abgerechnet</span>
+              <span className="text-muted-foreground">Abgerechnet (netto)</span>
               <span className="font-semibold">{formatMinutes(periodTotalMinutes)}</span>
             </div>
             <div className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2 text-sm">
@@ -2941,6 +3050,10 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 	            {sessionGroups.map((group) => {
 	              const dayDeviation = teamspaceDayDeviation(group.day);
 	              const hasDayDeviation = dayDeviation.deltaMinutes !== 0;
+		              const dayComparison = dayDeviation.comparison;
+		              const hasInvalidTeamspaceValue = Boolean(dayComparison?.tt_value_without_billed_session);
+		              const hasMissingTeamspaceValue = Boolean(dayComparison?.missing_tt_value);
+		              const showDayTeamspaceDetails = hasDayDeviation || hasInvalidTeamspaceValue || hasMissingTeamspaceValue;
 
               return (
               <div key={group.key} className="rounded-md border bg-background">
@@ -2951,39 +3064,30 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                     </p>
                     <p className="text-xs text-muted-foreground">{group.sessions.length} Session(s)</p>
                   </div>
-                  <Button
-                    type="button"
-                    size="sm"
-                    variant="secondary"
-                    className="h-8 min-w-32 justify-center justify-self-start"
-                    title="Teamspace-Aufbereitung"
-                    onClick={() => openTeamspacePreparation(group)}
-                  >
-                    <ClipboardList className="size-3.5" />
-                    TS
-                  </Button>
+                  {group.sessions.length > 0 ? (
+                    <Button
+                      type="button"
+                      size="sm"
+                      variant="secondary"
+                      className="h-8 min-w-32 justify-center justify-self-start"
+                      title="Teamspace-Aufbereitung"
+                      onClick={() => openTeamspacePreparation(group)}
+                    >
+                      <ClipboardList className="size-3.5" />
+                      TS
+                    </Button>
+                  ) : <span />}
                   <div className="flex min-w-0 flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
-                    <span>Abrechb. {formatMinutes(group.billableMinutes)}</span>
-                    <span>Abger. {formatMinutes(group.totalMinutes)}</span>
-                    <span>Nicht {formatMinutes(group.nonBillableMinutes)}</span>
                   </div>
                   <div className="flex justify-start lg:justify-center">
-                    {hasDayDeviation ? (
-                      <AlertCircle
-                        className="size-4 shrink-0 text-amber-500"
-                        aria-label="Teamspace-Tagesabweichung"
-                      />
-                    ) : (
+
                       <span className="h-4 w-4" aria-hidden="true" />
-                    )}
                   </div>
                   <div className="min-w-0 text-xs lg:text-right">
-                    <p className={cn("font-semibold", hasDayDeviation ? "text-amber-600 dark:text-amber-300" : "text-muted-foreground")}>
-                      {formatTeamspaceDifferenceTarget(dayDeviation.deltaMinutes, teamspaceTimeTrackingEnabled)}
-                    </p>
+
                   </div>
 		                  <div className="flex min-w-0 items-center justify-start gap-2 lg:justify-end">
-                        {teamspaceTimeTrackingEnabled ? (
+	                        {teamspaceTimeTrackingEnabled && group.sessions.length > 0 ? (
 		                      <div className="flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
 	                        <label htmlFor={`crm-billing-${group.key}`}>Teamspace</label>
 	                        <Input
@@ -3027,17 +3131,69 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 		                          <span className="sr-only">{savingDayBillingKey === group.key ? "Speichert..." : "Speichern"}</span>
 		                        </Button>
 		                      </div>
-                        ) : (
+	                        ) : group.sessions.length > 0 ? (
                           <span className="text-xs text-muted-foreground">Teamspace-Erfassung aus</span>
-                        )}
+	                        ) : null}
 		                  </div>
                 </div>
+                {showDayTeamspaceDetails ? (
+                  <div className="flex flex-col gap-2 border-b bg-muted/10 px-3 py-2 sm:flex-row sm:items-center sm:justify-between">
+                    <div className="flex min-w-0 flex-wrap items-center gap-2">
+                      {hasMissingTeamspaceValue ? (
+                        <Badge className={dayComparison?.acknowledged
+                          ? "bg-emerald-500/12 text-emerald-800 dark:bg-emerald-500/20 dark:text-emerald-200"
+                          : "bg-sky-500/12 text-sky-800 dark:bg-sky-500/20 dark:text-sky-200"}
+                        >
+                          {dayComparison?.acknowledged ? "Fehlender TT-Wert zur Kenntnis" : "TT-Teamspace-Wert fehlt"}
+                        </Badge>
+                      ) : null}
+                      {hasInvalidTeamspaceValue ? (
+                        <Badge variant="destructive">Fehler: TT-Teamspace-Wert ohne abgerechneten Eintrag</Badge>
+                      ) : null}
+                      {hasDayDeviation ? (
+                        <>
+                          <Badge className="bg-cyan-500/12 text-cyan-800 dark:bg-cyan-500/20 dark:text-cyan-200">
+                            TT-Teamspace {formatMinutes(dayDeviation.ttMinutes)}
+                          </Badge>
+                          <Badge className="bg-violet-500/12 text-violet-800 dark:bg-violet-500/20 dark:text-violet-200">
+                            TS-API {formatMinutes(dayDeviation.tsMinutes)}
+                          </Badge>
+                          <Badge className="bg-orange-500/12 text-orange-800 dark:bg-orange-500/20 dark:text-orange-200">
+                            {formatTeamspaceDifferenceTarget(dayDeviation.deltaMinutes, teamspaceTimeTrackingEnabled)}
+                          </Badge>
+                        </>
+                      ) : null}
+                      {hasInvalidTeamspaceValue ? (
+                        <span className="text-xs text-destructive">
+                          Kein abgerechneter Eintrag
+                          {Number(dayComparison?.non_billable_session_count ?? 0) > 0 ? ` · ${dayComparison?.non_billable_session_count} nicht abrechenbar` : ""}
+                          {Number(dayComparison?.billable_session_count ?? 0) > 0 ? ` · ${dayComparison?.billable_session_count} abrechenbar` : ""}
+                          {Number(dayComparison?.unrated_session_count ?? 0) > 0 ? ` · ${dayComparison?.unrated_session_count} ohne Bewertung` : ""}
+                        </span>
+                      ) : null}
+                    </div>
+                    {hasMissingTeamspaceValue && dayComparison ? (
+                      <Button
+                        type="button"
+                        size="sm"
+                        variant={dayComparison.acknowledged ? "secondary" : "ghost"}
+                        className="h-8 shrink-0"
+                        disabled={isPeriodClosed || acknowledgingTeamspaceDay === group.day}
+                        onClick={() => void setMissingTeamspaceDayAcknowledgement(dayComparison, !dayComparison.acknowledged)}
+                      >
+                        {dayComparison.acknowledged ? "Zurücknehmen" : "Zur Kenntnis"}
+                      </Button>
+                    ) : null}
+                  </div>
+                ) : null}
                 <div className="space-y-1.5 p-2 sm:p-3 lg:px-0">
                   {group.sessions.map((session) => {
                     const expanded = expandedSessionIds.includes(session.id);
                     const zammadSent = session.zammad_article_status === "sent";
                     const zammadPending = session.zammad_article_status === "pending";
                     const zammadMailImported = Boolean(session.zammad_source_article_id);
+	                    const workSegments = Array.isArray(session.work_segments) ? session.work_segments : [];
+	                    const hasWorkSegments = workSegments.length > 1;
 		                    const canSendZammad = !zammadMailImported && hasActivityContent(session.activity, session.zammad_article_body);
 		                    const sendingZammad = sendingZammadSessionId === session.id;
 		                    const billedMissingTeamspaceEntry =
@@ -3048,7 +3204,7 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 
                     return (
                       <div key={session.id} className="rounded-md border bg-card/40">
-                        <div className="grid gap-2 p-2 lg:grid-cols-[220px_minmax(0,150px)_minmax(260px,1fr)_220px] lg:items-center">
+	                        <div className="grid gap-2 p-2 lg:grid-cols-[220px_minmax(0,170px)_minmax(260px,1fr)_220px] lg:items-center">
                           <button
                             type="button"
                             className="flex min-w-0 items-center gap-2 rounded-md text-left text-sm text-muted-foreground hover:cursor-pointer hover:text-foreground focus-visible:outline-none focus-visible:ring-3 focus-visible:ring-ring/50"
@@ -3072,9 +3228,16 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
 	                              </Badge>
 	                            ) : null}
 	                          </button>
-                          <div className="flex min-w-0 flex-col items-start gap-1">
-                            <Badge variant="outline" className="w-fit">{formatMinutes(session.rounded_minutes)}</Badge>
-                            {session.recurring_billing_id ? <Badge variant="secondary">fix</Badge> : null}
+	                          <div className="grid min-w-0 grid-cols-[minmax(0,max-content)_2rem] items-start gap-2">
+	                            <div className="flex min-w-0 flex-col items-start gap-1">
+	                              <Badge variant="outline" className="w-fit">{formatMinutes(session.rounded_minutes)}</Badge>
+	                              {session.recurring_billing_id ? <Badge variant="secondary">fix</Badge> : null}
+	                            </div>
+	                            <div className="flex size-8 items-center justify-center">
+	                              {hasWorkSegments ? (
+	                                <ListClockIcon className="size-4 text-muted-foreground" aria-label="Arbeitsbereiche gespeichert" />
+	                              ) : null}
+	                            </div>
                           </div>
 	                          <BillingButtons
 	                            session={session}
@@ -3124,31 +3287,42 @@ export function TicketDetailPage({ periodType, period, ticketId, onNavigate, onS
                         </div>
                         {expanded ? (
                           <div className="border-t px-3 pb-3 pt-2">
-                            <SessionActivityBody session={session} />
-                            <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
-                              <span>{session.organization_name ?? session.customer_name}</span>
-                              <span>{session.work_type === "support" ? "Support" : "Consulting"}</span>
-                              {zammadMailImported ? (
-                                <span className="inline-flex items-center gap-1">
-                                  <MailCheck className="size-3.5 text-sky-500" aria-hidden="true" />
-                                  <span>Zammad-Mail importiert · Article {session.zammad_source_article_id}</span>
-                                </span>
-                              ) : null}
-                              {!zammadMailImported ? (
-                                <span className="inline-flex items-center gap-1">
-                                  {zammadSent ? <Send className="size-3.5 text-emerald-500" aria-hidden="true" /> : zammadPending ? <RotateCcw className="size-3.5 text-amber-500" aria-hidden="true" /> : <Send className="size-3.5 text-muted-foreground/60" aria-hidden="true" />}
-                                  <span>
-                                    {zammadSent
-                                      ? `Zammad übertragen · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
-                                      : zammadPending
-                                        ? `Zammad geparkt · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
-                                        : canSendZammad
-                                          ? "Nicht an Zammad übertragen"
-                                          : "Keine Zammad-Notiz (Tätigkeit leer)"}
-                                  </span>
-                                </span>
-                              ) : null}
-                              <span>Erfasst {formatDateTime(session.created_at)}</span>
+	                            <div className="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto]">
+	                              <div className="min-w-0">
+	                                <SessionActivityBody session={session} />
+	                                <div className="mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground">
+	                                  <span>{session.organization_name ?? session.customer_name}</span>
+	                                  <span>{session.work_type === "support" ? "Support" : "Consulting"}</span>
+	                                  {zammadMailImported ? (
+	                                    <span className="inline-flex items-center gap-1">
+	                                      <MailCheck className="size-3.5 text-sky-500" aria-hidden="true" />
+	                                      <span>Zammad-Mail importiert · Article {session.zammad_source_article_id}</span>
+	                                    </span>
+	                                  ) : null}
+	                                  {!zammadMailImported ? (
+	                                    <span className="inline-flex items-center gap-1">
+	                                      {zammadSent ? <Send className="size-3.5 text-emerald-500" aria-hidden="true" /> : zammadPending ? <RotateCcw className="size-3.5 text-amber-500" aria-hidden="true" /> : <Send className="size-3.5 text-muted-foreground/60" aria-hidden="true" />}
+	                                      <span>
+	                                        {zammadSent
+	                                          ? `Zammad übertragen · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
+	                                          : zammadPending
+	                                            ? `Zammad geparkt · ${zammadArticleTypeLabel(session.zammad_article_type_id)}`
+	                                            : canSendZammad
+	                                              ? "Nicht an Zammad übertragen"
+	                                              : "Keine Zammad-Notiz (Tätigkeit leer)"}
+	                                      </span>
+	                                    </span>
+	                                  ) : null}
+	                                  <span>Erfasst {formatDateTime(session.created_at)}</span>
+	                                </div>
+	                              </div>
+	                              {hasWorkSegments ? (
+	                                <div className="space-y-1 text-right text-xs text-muted-foreground">
+	                                  {workSegments.map((segment, index) => (
+	                                    <div key={`${segment.startedAt}-${segment.endedAt ?? "open"}-${index}`}>{formatWorkSegmentRange(segment)}</div>
+	                                  ))}
+	                                </div>
+	                              ) : null}
                             </div>
                           </div>
                         ) : null}
diff --git a/frontend/src/views/TimerPage.tsx b/frontend/src/views/TimerPage.tsx
index 0ebd6e3..f0cf4cf 100644
--- a/frontend/src/views/TimerPage.tsx
+++ b/frontend/src/views/TimerPage.tsx
@@ -17,7 +17,7 @@ import type { CreateSessionResult } from "../api";
 import { formatTimer } from "../format";
 import { isRecurringBillingTicketNumber, ticketHasRecurringBilling } from "../recurring-billings";
 import { activeElapsedMs, mergeTimerActivityDrafts, removeTimerActivityDraft, ticketPattern, type TimerEntry, writeTimerActivityDraft } from "../timers";
-import type { AuthUser, BillingStatus, RecurringBilling, TicketMeta, WorkType } from "../types";
+import type { AuthUser, BillingStatus, RecurringBilling, TicketMeta, WorkSegment, WorkType } from "../types";
 import { zammadArticleTypeFromValue, zammadArticleTypeOptions, zammadArticleTypeValue, type ZammadArticleTypeId } from "../zammad-article-types";
 
 type ManualSessionFormState = {
@@ -77,6 +77,7 @@ type FinishedSession = {
   endedAt: string;
   durationSeconds: number;
   roundedMinutes: number;
+  workSegments: WorkSegment[];
 };
 
 function ticketTeamspaceEntries(ticket: TicketMeta | null | undefined) {
@@ -104,6 +105,8 @@ type TimerPageProps = {
   setSelectedTimerId: Dispatch<SetStateAction<string | null>>;
   tick: number;
   currentUser: AuthUser;
+  finishRequestId?: string | null;
+  onFinishRequestHandled?: () => void;
 };
 
 function BillingStatusSelect({
@@ -297,7 +300,7 @@ function InlineImageActivityEditor({
   );
 }
 
-export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimerId, tick, currentUser }: TimerPageProps) {
+export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimerId, tick, currentUser, finishRequestId, onFinishRequestHandled }: TimerPageProps) {
   const [ticketNumber, setTicketNumber] = useState("");
   const [finished, setFinished] = useState<FinishedSession | null>(null);
   const [finishingId, setFinishingId] = useState<string | null>(null);
@@ -680,6 +683,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
       });
       setTimers(mergeTimerActivityDrafts(currentUser.id, timerResult.timers));
       setSelectedTimerId(timer.id);
+      const finishedTimer = timerResult.timers.find((entry) => entry.id === timer.id) ?? timer;
 
       const result = await lookupTicket(timer.ticketNumber);
       const ticket = result.ticket;
@@ -711,7 +715,8 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
         startedAt: new Date(timer.startedAt).toISOString(),
         endedAt: new Date(now).toISOString(),
         durationSeconds,
-        roundedMinutes
+        roundedMinutes,
+        workSegments: currentUser.session_work_segments_enabled ? finishedTimer.workSegments ?? [] : []
       });
     } catch (error) {
       toast.error("Ticket konnte nicht geprüft werden", {
@@ -722,6 +727,22 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
     }
   }
 
+  useEffect(() => {
+    if (!finishRequestId) {
+      return;
+    }
+
+    const timerExists = timers.some((timer) => timer.id === finishRequestId);
+    onFinishRequestHandled?.();
+
+    if (!timerExists) {
+      return;
+    }
+
+    setSelectedTimerId(finishRequestId);
+    void finishTimer(finishRequestId);
+  }, [finishRequestId]);
+
   async function submitSession(event: FormEvent) {
     event.preventDefault();
 
@@ -768,6 +789,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
         startedAt: finished.startedAt,
         endedAt: finished.endedAt,
         durationSeconds: finished.durationSeconds,
+        workSegments: finished.workSegments,
         organizationId: effectiveOrganizationId,
         activity: activityValue.activity,
         zammadArticleBody: activityValue.zammadArticleBody || null,
@@ -875,6 +897,7 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
         projectTeamspaceEntryId: manualRequiresTeamspaceEntry ? manualSession.projectTeamspaceEntryId : null,
         billingStatus: manualSession.billingStatus,
         createZammadArticle: manualSession.createZammadArticle && hasActivityContent(activityValue.activity, activityValue.zammadArticleBody),
+        zammadArticleDateHeader: true,
         zammadArticleTypeId: manualSession.zammadArticleTypeId
       });
       toast.success("Session nachgetragen", {
@@ -897,6 +920,8 @@ export function TimerPage({ timers, setTimers, selectedTimerId, setSelectedTimer
     }
   }
 
+  const finishedEffectiveWorkType = finished?.ticket?.organization_id && finished.ticket.work_type ? finished.ticket.work_type : workType;
+
   return (
     <div className="space-y-4">
       <section className="space-y-4">
diff --git a/frontend/src/views/ZammadSyncPage.tsx b/frontend/src/views/ZammadSyncPage.tsx
index 7916d13..f73a371 100644
--- a/frontend/src/views/ZammadSyncPage.tsx
+++ b/frontend/src/views/ZammadSyncPage.tsx
@@ -924,7 +924,7 @@ export function ZammadSyncPage({ currentUser }: ZammadSyncPageProps) {
       const { result } = await syncTeamspaceProjectIds(zammadSyncPageState.teamspaceSyncMonth);
       setZammadSyncPageState({ teamspaceProjectIdResult: result });
       toast.success("Teamspace-Projekt-IDs synchronisiert", {
-        description: `${result.updated} aktualisiert, ${result.alreadyCurrent} bereits aktuell, ${result.subentriesSynced} Unterposition(en), TS ${formatMinutes(result.teamspaceTimeBillableMinutes)} im Monat ${result.month}.`
+        description: `${result.updated} aktualisiert, ${result.alreadyCurrent} bereits aktuell, TS ${formatMinutes(result.teamspaceTimeBillableMinutes)} im Monat ${result.month}.`
       });
     } catch (error) {
       toast.error("Teamspace-Projekt-IDs konnten nicht synchronisiert werden", {
@@ -1113,7 +1113,7 @@ export function ZammadSyncPage({ currentUser }: ZammadSyncPageProps) {
                 <DatabaseZap className="size-5 text-muted-foreground" />
                 Teamspace-Projekt-IDs
               </CardTitle>
-              <CardDescription>Offene Consulting-Projekte gegen die Teamspace-API auflösen und API-ID, Gesamtbudget sowie Unterpositionen aus Teamspace speichern.</CardDescription>
+              <CardDescription>Offene Consulting-Projekte gegen die Teamspace-API auflösen und Hauptprojekt-ID sowie Gesamtbudget aus Teamspace speichern.</CardDescription>
             </div>
             <Badge variant={teamspaceReady ? "success" : "secondary"}>{teamspaceReady ? "bereit" : "nicht bereit"}</Badge>
           </div>
@@ -1140,7 +1140,7 @@ export function ZammadSyncPage({ currentUser }: ZammadSyncPageProps) {
             </div>
             <Button type="button" disabled={!teamspaceReady || individualSyncDisabled} onClick={() => void runTeamspaceProjectIdSync()}>
               <RefreshCw className="size-4" />
-              {syncingTeamspaceProjectIds ? "Synchronisiert..." : "Teamspace-IDs, Budgets und Positionen synchronisieren"}
+              {syncingTeamspaceProjectIds ? "Synchronisiert..." : "Teamspace-IDs und Budgets synchronisieren"}
             </Button>
           </div>
           {teamspaceProjectIdResult ? (
@@ -1150,7 +1150,6 @@ export function ZammadSyncPage({ currentUser }: ZammadSyncPageProps) {
                   ["Monat", teamspaceProjectIdResult.month],
                   ["TT-Einträge", teamspaceProjectIdResult.checkedEntries],
                   ["TS gelesen", teamspaceProjectIdResult.remoteProjectsScanned],
-                  ["TS Positionen gelesen", teamspaceProjectIdResult.remoteSubprojectsScanned],
                   ["TS Zeiten gelesen", teamspaceProjectIdResult.teamspaceTimeEntriesScanned],
                   ["TS Zeiten zugeordnet", teamspaceProjectIdResult.teamspaceTimeEntriesMapped],
                   ["TS Monat", formatMinutes(teamspaceProjectIdResult.teamspaceTimeBillableMinutes)],
@@ -1158,8 +1157,6 @@ export function ZammadSyncPage({ currentUser }: ZammadSyncPageProps) {
                   ["Treffer", teamspaceProjectIdResult.matched],
                   ["IDs aktualisiert", teamspaceProjectIdResult.updated],
                   ["Aktuell", teamspaceProjectIdResult.alreadyCurrent],
-                  ["Positionen", teamspaceProjectIdResult.subentriesSynced],
-                  ["Entfernt", teamspaceProjectIdResult.subentriesRemoved],
                   ["Offen", teamspaceProjectIdResult.missing + teamspaceProjectIdResult.ambiguous]
                 ].map(([label, value]) => (
                   <div key={label} className="rounded-md border bg-muted/20 px-3 py-2">
diff --git a/objects.json b/objects.json
new file mode 100644
index 0000000..986b33c
--- /dev/null
+++ b/objects.json
@@ -0,0 +1,164 @@
+[
+  {
+    "id": 85,
+    "name": "customer_owner",
+    "display": "Kunde zugeordnet zu",
+    "data_type": "select",
+    "data_option": {
+      "options": {
+        "AIKAVA": "AIKAVA",
+        "ATOSS": "ATOSS",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "Pro Active": "Pro Active"
+      },
+      "default": "ATOSS",
+      "linktemplate": "",
+      "translate": false,
+      "null": true,
+      "relation": "",
+      "nulloption": true,
+      "maxlength": 255,
+      "historical_options": {
+        "ATOSS": "ATOSS",
+        "AIKAVA": "AIKAVA",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "Pro Active": "Pro Active"
+      }
+    },
+    "data_option_new": {
+
+    },
+    "editable": true,
+    "active": true,
+    "screens": {
+      "view": {
+        "ticket.customer": {
+          "shown": true
+        },
+        "ticket.agent": {
+          "shown": true
+        },
+        "admin.organization": {
+          "shown": true
+        }
+      },
+      "create": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      },
+      "edit": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      }
+    },
+    "to_create": false,
+    "to_migrate": false,
+    "to_delete": false,
+    "to_config": false,
+    "position": 1813,
+    "created_by_id": 4,
+    "updated_by_id": 4,
+    "created_at": "2026-04-22T14:46:46.993Z",
+    "updated_at": "2026-08-19T12:35:58.304Z",
+    "internal": false,
+    "object": "Organization",
+    "deletable": true
+  },
+  {
+    "id": 86,
+    "name": "hotline_contract",
+    "display": "Hotlinevertrag bei",
+    "data_type": "select",
+    "data_option": {
+      "options": {
+        "AIKAVA": "AIKAVA",
+        "ATOSS": "ATOSS",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "(kein Hotlinevertrag)": "(kein Hotlinevertrag)"
+      },
+      "default": "ATOSS",
+      "linktemplate": "",
+      "translate": false,
+      "null": true,
+      "relation": "",
+      "nulloption": true,
+      "maxlength": 255,
+      "historical_options": {
+        "ATOSS": "ATOSS",
+        "AIKAVA": "AIKAVA",
+        "Compdata": "Compdata",
+        "OSC": "OSC",
+        "SD Worx": "SD Worx",
+        "(kein Hotlinevertrag)": "(kein Hotlinevertrag)"
+      }
+    },
+    "data_option_new": {
+
+    },
+    "editable": true,
+    "active": true,
+    "screens": {
+      "view": {
+        "ticket.customer": {
+          "shown": true
+        },
+        "ticket.agent": {
+          "shown": true
+        },
+        "admin.organization": {
+          "shown": true
+        }
+      },
+      "create": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      },
+      "edit": {
+        "ticket.agent": {
+          "shown": true,
+          "required": false
+        },
+        "admin.organization": {
+          "shown": true,
+          "required": false
+        }
+      }
+    },
+    "to_create": false,
+    "to_migrate": false,
+    "to_delete": false,
+    "to_config": false,
+    "position": 1814,
+    "created_by_id": 4,
+    "updated_by_id": 4,
+    "created_at": "2026-04-22T14:48:44.782Z",
+    "updated_at": "2026-04-22T15:11:55.575Z",
+    "internal": false,
+    "object": "Organization",
+    "deletable": true
+  }
+]
\ No newline at end of file
diff --git a/scripts/normalize-teamspace-main-projects.mts b/scripts/normalize-teamspace-main-projects.mts
new file mode 100644
index 0000000..b6b8cea
--- /dev/null
+++ b/scripts/normalize-teamspace-main-projects.mts
@@ -0,0 +1,277 @@
+import pg from "pg";
+
+import { decryptSecret } from "../backend/src/secrets.js";
+
+const apply = process.argv.includes("--apply");
+
+if (!process.env.DATABASE_URL) {
+  throw new Error("DATABASE_URL fehlt");
+}
+
+type JsonPosition = {
+  apiProjectId?: string | number | null;
+  minutes?: number;
+  billableMinutes?: number;
+  entryCount?: number;
+  days?: Array<{ day?: string; minutes?: number; billableMinutes?: number; entryCount?: number }>;
+};
+
+type RemoteProject = {
+  apiProjectId: number;
+  mainApiProjectId: number;
+  projectId: string;
+  name: string;
+  customerApiId: number | null;
+  customerName: string | null;
+  url: string | null;
+};
+
+const pool = new pg.Pool({ connectionString: process.env.DATABASE_URL });
+
+function positiveInteger(value: unknown) {
+  const parsed = Number(value);
+  return Number.isInteger(parsed) && parsed > 0 ? parsed : null;
+}
+
+function text(value: unknown) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+
+async function main() {
+  const settingsResult = await pool.query<{ key: string; value: string }>(
+    "SELECT key, value FROM app_settings WHERE key = ANY($1::text[]);",
+    [["teamspace.base_url", "teamspace.admin_credentials_user_id"]]
+  );
+  const settings = new Map(settingsResult.rows.map((row) => [row.key, row.value]));
+  const baseUrl = settings.get("teamspace.base_url")?.replace(/\/$/, "");
+  const credentialsUserId = settings.get("teamspace.admin_credentials_user_id");
+
+  if (!baseUrl || !credentialsUserId) {
+    throw new Error("Teamspace-Adminzugang ist nicht vollständig konfiguriert");
+  }
+
+  const credentialsResult = await pool.query<{ teamspace_device_id: string | null; teamspace_device_password: string | null }>(
+    "SELECT teamspace_device_id, teamspace_device_password FROM users WHERE id = $1;",
+    [credentialsUserId]
+  );
+  const deviceId = decryptSecret(credentialsResult.rows[0]?.teamspace_device_id);
+  const devicePassword = decryptSecret(credentialsResult.rows[0]?.teamspace_device_password);
+
+  if (!deviceId || !devicePassword) {
+    throw new Error("Teamspace-Adminzugang enthält keine Geräte-Credentials");
+  }
+
+  const authorization = `Basic ${Buffer.from(`${deviceId}:${devicePassword}`).toString("base64")}`;
+  const fetchJson = async (path: string) => {
+    const response = await fetch(`${baseUrl}${path}`, { headers: { Authorization: authorization, Accept: "application/json" } });
+
+    if (!response.ok) {
+      throw new Error(`Teamspace ${path} antwortet mit HTTP ${response.status}`);
+    }
+
+    return response.json() as Promise<Record<string, unknown>>;
+  };
+
+  const [entryResult, resourceResult, exclusionResult, userActualResult, entryActualResult] = await Promise.all([
+    pool.query<{ id: string; api_id: string }>("SELECT id::text, teamspace_api_project_id::text AS api_id FROM project_teamspace_entries WHERE teamspace_api_project_id IS NOT NULL;"),
+    pool.query<{ id: string; api_id: string }>("SELECT id::text, teamspace_api_project_id::text AS api_id FROM teamspace_project_resources WHERE teamspace_api_project_id IS NOT NULL;"),
+    pool.query<{ teamspace_project: string; api_id: string | null; api_ids: string[] }>(`
+      SELECT teamspace_project,
+             teamspace_api_project_id::text AS api_id,
+             ARRAY(SELECT value::text FROM unnest(teamspace_api_project_ids) AS value) AS api_ids
+      FROM teamspace_project_exclusions;
+    `),
+    pool.query<{ user_id: string; month: string; positions: JsonPosition[] }>("SELECT user_id::text, month::text, positions FROM teamspace_monthly_user_actuals;"),
+    pool.query<{ user_id: string; project_teamspace_entry_id: string; month: string; positions: JsonPosition[] }>(
+      "SELECT user_id::text, project_teamspace_entry_id::text, month::text, positions FROM project_teamspace_monthly_actuals;"
+    )
+  ]);
+
+  const apiIds = new Set<number>();
+  const addApiId = (value: unknown) => {
+    const apiId = positiveInteger(value);
+    if (apiId) apiIds.add(apiId);
+  };
+
+  entryResult.rows.forEach((row) => addApiId(row.api_id));
+  resourceResult.rows.forEach((row) => addApiId(row.api_id));
+  exclusionResult.rows.forEach((row) => {
+    addApiId(row.api_id);
+    row.api_ids.forEach(addApiId);
+  });
+  [...userActualResult.rows, ...entryActualResult.rows].forEach((row) => row.positions.forEach((position) => addApiId(position.apiProjectId)));
+
+  const rawProjects = new Map<number, Record<string, unknown>>();
+  const ids = [...apiIds].sort((left, right) => left - right);
+
+  for (let offset = 0; offset < ids.length; offset += 8) {
+    const projects = await Promise.all(ids.slice(offset, offset + 8).map(async (apiId) => [apiId, await fetchJson(`/api/project/${apiId}`)] as const));
+    projects.forEach(([apiId, project]) => rawProjects.set(apiId, project));
+  }
+
+  const mainIds = new Set<number>();
+  for (const [apiId, project] of rawProjects) {
+    mainIds.add(positiveInteger((project.mainProject as Record<string, unknown> | undefined)?.value) ?? apiId);
+  }
+
+  const missingMainIds = [...mainIds].filter((apiId) => !rawProjects.has(apiId));
+  for (let offset = 0; offset < missingMainIds.length; offset += 8) {
+    const projects = await Promise.all(missingMainIds.slice(offset, offset + 8).map(async (apiId) => [apiId, await fetchJson(`/api/project/${apiId}`)] as const));
+    projects.forEach(([apiId, project]) => rawProjects.set(apiId, project));
+  }
+
+  const customerIds = new Set<number>();
+  for (const apiId of mainIds) {
+    const customerApiId = positiveInteger((rawProjects.get(apiId)?.customer as Record<string, unknown> | undefined)?.value);
+    if (customerApiId) customerIds.add(customerApiId);
+  }
+  const customerNames = new Map<number, string>();
+
+  for (let offset = 0; offset < customerIds.size; offset += 8) {
+    const chunk = [...customerIds].slice(offset, offset + 8);
+    const customers = await Promise.all(chunk.map(async (apiId) => [apiId, await fetchJson(`/api/organization/${apiId}`)] as const));
+    customers.forEach(([apiId, customer]) => {
+      const name = text(customer.name) ?? text(customer.companyName) ?? text(customer.displayName);
+      if (name) customerNames.set(apiId, name);
+    });
+  }
+
+  const projectMap = new Map<number, RemoteProject>();
+  for (const sourceApiId of apiIds) {
+    const source = rawProjects.get(sourceApiId);
+    if (!source) throw new Error(`Teamspace API-ID ${sourceApiId} konnte nicht aufgelöst werden`);
+    const mainApiProjectId = positiveInteger((source.mainProject as Record<string, unknown> | undefined)?.value) ?? sourceApiId;
+    const project = rawProjects.get(mainApiProjectId);
+    if (!project) throw new Error(`Teamspace Hauptprojekt ${mainApiProjectId} konnte nicht aufgelöst werden`);
+    const customerApiId = positiveInteger((project.customer as Record<string, unknown> | undefined)?.value);
+    const projectId = text(project.projectId);
+    if (!projectId) throw new Error(`Teamspace Hauptprojekt ${mainApiProjectId} hat keine Projektnummer`);
+
+    projectMap.set(sourceApiId, {
+      apiProjectId: mainApiProjectId,
+      mainApiProjectId,
+      projectId,
+      name: text(project.name) ?? projectId,
+      customerApiId,
+      customerName: customerApiId ? customerNames.get(customerApiId) ?? null : null,
+      url: text(project._url)
+    });
+  }
+
+  const normalizePositions = (positions: JsonPosition[]) => {
+    const grouped = new Map<number, {
+      project: RemoteProject;
+      minutes: number;
+      billableMinutes: number;
+      entryCount: number;
+      days: Map<string, { minutes: number; billableMinutes: number; entryCount: number }>;
+    }>();
+
+    for (const position of positions) {
+      const sourceApiId = positiveInteger(position.apiProjectId);
+      if (!sourceApiId) continue;
+      const project = projectMap.get(sourceApiId);
+      if (!project) throw new Error(`Keine Hauptprojekt-Zuordnung für API-ID ${sourceApiId}`);
+      const current = grouped.get(project.mainApiProjectId) ?? { project, minutes: 0, billableMinutes: 0, entryCount: 0, days: new Map() };
+      current.minutes += Number(position.minutes ?? 0);
+      current.billableMinutes += Number(position.billableMinutes ?? 0);
+      current.entryCount += Number(position.entryCount ?? 0);
+
+      for (const sourceDay of position.days ?? []) {
+        const dayLabel = text(sourceDay.day);
+        if (!dayLabel) continue;
+        const day = current.days.get(dayLabel) ?? { minutes: 0, billableMinutes: 0, entryCount: 0 };
+        day.minutes += Number(sourceDay.minutes ?? 0);
+        day.billableMinutes += Number(sourceDay.billableMinutes ?? 0);
+        day.entryCount += Number(sourceDay.entryCount ?? 0);
+        current.days.set(dayLabel, day);
+      }
+
+      grouped.set(project.mainApiProjectId, current);
+    }
+
+    return [...grouped.values()].sort((left, right) => left.project.mainApiProjectId - right.project.mainApiProjectId).map((value) => ({
+      apiProjectId: String(value.project.mainApiProjectId),
+      projectId: value.project.projectId,
+      mainProjectId: value.project.projectId,
+      label: value.project.name,
+      customerName: value.project.customerName,
+      isSubentry: false,
+      billingType: null,
+      minutes: value.minutes,
+      billableMinutes: value.billableMinutes,
+      entryCount: value.entryCount,
+      days: [...value.days.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([day, totals]) => ({ day, ...totals }))
+    }));
+  };
+
+  const normalizedUserActuals = userActualResult.rows.map((row) => ({ ...row, positions: normalizePositions(row.positions) }));
+  const normalizedEntryActuals = entryActualResult.rows.map((row) => ({ ...row, positions: normalizePositions(row.positions) }));
+  const subentryCountResult = await pool.query<{ count: number }>("SELECT count(*)::int AS count FROM project_teamspace_subentries;");
+  const changedSourceIds = [...projectMap.entries()].filter(([sourceApiId, project]) => sourceApiId !== project.mainApiProjectId).length;
+
+  console.log(JSON.stringify({
+    mode: apply ? "apply" : "dry-run",
+    apiIdsChecked: apiIds.size,
+    subprojectIdsNormalized: changedSourceIds,
+    monthlyUserActuals: normalizedUserActuals.length,
+    monthlyProjectActuals: normalizedEntryActuals.length,
+    legacySubentriesToDelete: subentryCountResult.rows[0]?.count ?? 0
+  }, null, 2));
+
+  if (!apply) return;
+
+  const client = await pool.connect();
+  try {
+    await client.query("BEGIN");
+
+    for (const row of entryResult.rows) {
+      const project = projectMap.get(Number(row.api_id));
+      if (!project) continue;
+      await client.query("UPDATE project_teamspace_entries SET teamspace_api_project_id=$2, teamspace_api_project_url=$3, updated_at=now() WHERE id=$1;", [row.id, project.mainApiProjectId, project.url]);
+    }
+    for (const row of resourceResult.rows) {
+      const project = projectMap.get(Number(row.api_id));
+      if (!project) continue;
+      await client.query("UPDATE teamspace_project_resources SET teamspace_api_project_id=$2, teamspace_api_project_url=$3, updated_at=now() WHERE id=$1;", [row.id, project.mainApiProjectId, project.url]);
+    }
+    for (const row of exclusionResult.rows) {
+      const sourceApiId = positiveInteger(row.api_id) ?? row.api_ids.map(positiveInteger).find((value): value is number => value !== null);
+      const project = sourceApiId ? projectMap.get(sourceApiId) : null;
+      await client.query(`
+        UPDATE teamspace_project_exclusions
+        SET teamspace_api_project_id=$2,
+            teamspace_api_project_ids=CASE WHEN $2::bigint IS NULL THEN '{}'::bigint[] ELSE ARRAY[$2::bigint] END,
+            teamspace_name=COALESCE($3, teamspace_name),
+            customer_name=COALESCE($4, customer_name),
+            updated_at=now()
+        WHERE teamspace_project=$1;
+      `, [row.teamspace_project, project?.mainApiProjectId ?? null, project?.name ?? null, project?.customerName ?? null]);
+    }
+    for (const row of normalizedUserActuals) {
+      const minutes = row.positions.reduce((sum, position) => sum + position.minutes, 0);
+      const billableMinutes = row.positions.reduce((sum, position) => sum + position.billableMinutes, 0);
+      const entryCount = row.positions.reduce((sum, position) => sum + position.entryCount, 0);
+      await client.query(`UPDATE teamspace_monthly_user_actuals SET positions=$3::jsonb, teamspace_minutes=$4, teamspace_billable_minutes=$5, teamspace_time_entry_count=$6, updated_at=now() WHERE user_id=$1 AND month=$2::date;`, [row.user_id, row.month, JSON.stringify(row.positions), minutes, billableMinutes, entryCount]);
+    }
+    for (const row of normalizedEntryActuals) {
+      const minutes = row.positions.reduce((sum, position) => sum + position.minutes, 0);
+      const billableMinutes = row.positions.reduce((sum, position) => sum + position.billableMinutes, 0);
+      const entryCount = row.positions.reduce((sum, position) => sum + position.entryCount, 0);
+      await client.query(`UPDATE project_teamspace_monthly_actuals SET positions=$4::jsonb, teamspace_minutes=$5, teamspace_billable_minutes=$6, teamspace_time_entry_count=$7, updated_at=now() WHERE user_id=$1 AND project_teamspace_entry_id=$2 AND month=$3::date;`, [row.user_id, row.project_teamspace_entry_id, row.month, JSON.stringify(row.positions), minutes, billableMinutes, entryCount]);
+    }
+    await client.query("DELETE FROM project_teamspace_subentries;");
+    await client.query("COMMIT");
+  } catch (error) {
+    await client.query("ROLLBACK");
+    throw error;
+  } finally {
+    client.release();
+  }
+}
+
+try {
+  await main();
+} finally {
+  await pool.end();
+}