diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
index 99364ae450..0aa1becea5 100644
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -215,6 +215,23 @@ paths:
               schema:
                 type: array
                 items: {type: string}
+  /api/ai/map-compliance-issues:
+    post:
+      tags: [ai-resource]
+      operationId: mapComplianceIssues
+      requestBody:
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/MapComplianceIssuesRequestDTO'}
+        required: true
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items: {$ref: '#/components/schemas/ComplianceIssue'}
   /api/ai/translateJobDescriptionStream:
     put:
       tags: [ai-resource]
@@ -3333,6 +3350,7 @@ components:
         explanation: {type: string}
         id: {type: string}
         language: {type: string}
+        suggestion: {type: string}
         text: {type: string}
     ConflictDataDTO:
       type: object
@@ -3880,6 +3898,17 @@ components:
         email: {type: string, format: email, minLength: 1}
         password: {type: string, minLength: 1}
       required: [email, password]
+    MapComplianceIssuesRequestDTO:
+      type: object
+      properties:
+        complianceIssues:
+          type: array
+          items: {$ref: '#/components/schemas/ComplianceIssue'}
+        jobId: {type: string, format: uuid}
+        text: {type: string, minLength: 1}
+        toLang: {type: string}
+        translatedText: {type: string, minLength: 1}
+      required: [complianceIssues, text, translatedText]
     MultipartUploadRequest:
       type: object
       properties:
diff --git a/src/main/java/de/tum/cit/aet/ai/domain/ComplianceIssue.java b/src/main/java/de/tum/cit/aet/ai/domain/ComplianceIssue.java
index d02ae136b6..75eb9cb0b0 100644
--- a/src/main/java/de/tum/cit/aet/ai/domain/ComplianceIssue.java
+++ b/src/main/java/de/tum/cit/aet/ai/domain/ComplianceIssue.java
@@ -29,5 +29,6 @@ public class ComplianceIssue {
     @Enumerated(EnumType.STRING)
     private ComplianceAction action;
 
+    private String suggestion;
     private String language;
 }
diff --git a/src/main/java/de/tum/cit/aet/ai/dto/MapComplianceIssuesRequestDTO.java b/src/main/java/de/tum/cit/aet/ai/dto/MapComplianceIssuesRequestDTO.java
new file mode 100644
index 0000000000..e7d1668ab7
--- /dev/null
+++ b/src/main/java/de/tum/cit/aet/ai/dto/MapComplianceIssuesRequestDTO.java
@@ -0,0 +1,17 @@
+package de.tum.cit.aet.ai.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import de.tum.cit.aet.ai.domain.ComplianceIssue;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import java.util.List;
+import java.util.UUID;
+
+@JsonInclude
+public record MapComplianceIssuesRequestDTO(
+    String toLang,
+    UUID jobId,
+    @NotBlank String text,
+    @NotBlank String translatedText,
+    @NotNull List<ComplianceIssue> complianceIssues
+) {}
diff --git a/src/main/java/de/tum/cit/aet/ai/service/AiService.java b/src/main/java/de/tum/cit/aet/ai/service/AiService.java
index 1523387201..20c3a52b7e 100644
--- a/src/main/java/de/tum/cit/aet/ai/service/AiService.java
+++ b/src/main/java/de/tum/cit/aet/ai/service/AiService.java
@@ -6,6 +6,7 @@
 import de.tum.cit.aet.ai.domain.ComplianceIssue;
 import de.tum.cit.aet.ai.dto.ExtractedApplicationDataDTO;
 import de.tum.cit.aet.ai.dto.ExtractedCertificateDataDTO;
+import de.tum.cit.aet.ai.dto.MapComplianceIssuesRequestDTO;
 import de.tum.cit.aet.application.service.ApplicationService;
 import de.tum.cit.aet.core.documents.service.DocumentService;
 import de.tum.cit.aet.core.dto.GenderBiasAnalysisResponse;
@@ -27,6 +28,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 import javax.imageio.ImageIO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.Loader;
@@ -74,6 +76,9 @@ public class AiService {
     @Value("classpath:prompts/AnalyzeComplianceText.st")
     private Resource complianceResource;
 
+    @Value("classpath:prompts/SnippetMapping.st")
+    private Resource snippetMappingResource;
+
     private final ChatClient chatClient;
 
     private final JobService jobService;
@@ -475,7 +480,10 @@ public List<ComplianceIssue> analyzeJobDescription(
                     )
                     .call()
                     .entity(new ParameterizedTypeReference<>() {});
-                complianceIssues.forEach(issue -> issue.setLanguage(lang));
+                complianceIssues.forEach(issue -> {
+                    issue.setId(UUID.randomUUID().toString());
+                    issue.setLanguage(lang);
+                });
                 aiFeatureToggleService.recordSuccess();
             } catch (Exception e) {
                 aiFeatureToggleService.recordFailure();
@@ -496,4 +504,88 @@ public List<ComplianceIssue> analyzeJobDescription(
 
         return complianceIssues;
     }
+
+    /**
+     * Maps the snippets of an existing source-language compliance analysis onto the
+     * translated job description, avoiding a second full LLM compliance analysis.
+     *
+     * @param request DTO containing the source compliance issues, original text, translated text, target language, and job ID
+     * @return the persisted list of mapped issues, in the same order as sourceIssues
+     */
+    public List<ComplianceIssue> mapComplianceIssues(MapComplianceIssuesRequestDTO request) {
+        if (request.complianceIssues() == null) {
+            return List.of();
+        }
+        List<ComplianceIssue> mappableIssues = request
+            .complianceIssues()
+            .stream()
+            .filter(issue -> issue != null && issue.getText() != null && !issue.getText().isBlank())
+            .toList();
+
+        // Issues without a text snippet cannot produce a highlight and must not
+        // invalidate the complete mapping batch.
+        if (mappableIssues.isEmpty()) {
+            jobService.updateComplianceIssues(request.jobId(), List.of(), request.toLang());
+            return List.of();
+        }
+        // Missing target text only means "cannot map" -> do not clear existing issues.
+        if (request.translatedText() == null || request.translatedText().isBlank()) {
+            return List.of();
+        }
+        if (!aiFeatureToggleService.isAiAvailable()) {
+            return List.of();
+        }
+
+        String issues = mappableIssues
+            .stream()
+            .map(
+                issue -> "Text: " + issue.getText().trim() + "\nSuggestion: " + (issue.getSuggestion() == null ? "" : issue.getSuggestion())
+            )
+            .collect(Collectors.joining("\n---\n"));
+
+        List<String> mappedTexts;
+        try {
+            mappedTexts = chatClient
+                .prompt()
+                .user(u ->
+                    u
+                        .text(snippetMappingResource)
+                        .param("issues", issues)
+                        .param("jobDescription", request.text())
+                        .param("translatedText", request.translatedText())
+                        .param("targetLanguage", request.toLang())
+                )
+                .call()
+                .entity(new ParameterizedTypeReference<List<String>>() {});
+            aiFeatureToggleService.recordSuccess();
+        } catch (Exception e) {
+            aiFeatureToggleService.recordFailure();
+            throw new InternalServerException("Compliance issue mapping failed", e);
+        }
+
+        if (mappedTexts == null || mappedTexts.size() != mappableIssues.size() * 2) {
+            aiFeatureToggleService.recordFailure();
+            throw new InternalServerException("Mapping returned an invalid number of snippets");
+        }
+
+        List<ComplianceIssue> mappedIssues = new ArrayList<>();
+        for (int i = 0; i < mappableIssues.size(); i++) {
+            ComplianceIssue sourceIssue = mappableIssues.get(i);
+            mappedIssues.add(
+                new ComplianceIssue(
+                    sourceIssue.getId(),
+                    sourceIssue.getCategory(),
+                    mappedTexts.get(i * 2).trim(),
+                    sourceIssue.getArticle(),
+                    sourceIssue.getExplanation(),
+                    sourceIssue.getAction(),
+                    mappedTexts.get(i * 2 + 1).trim(),
+                    request.toLang()
+                )
+            );
+        }
+
+        jobService.updateComplianceIssues(request.jobId(), mappedIssues, request.toLang());
+        return mappedIssues;
+    }
 }
diff --git a/src/main/java/de/tum/cit/aet/ai/service/ComplianceScoreService.java b/src/main/java/de/tum/cit/aet/ai/service/ComplianceScoreService.java
index b60c83307e..658e97ba08 100644
--- a/src/main/java/de/tum/cit/aet/ai/service/ComplianceScoreService.java
+++ b/src/main/java/de/tum/cit/aet/ai/service/ComplianceScoreService.java
@@ -18,7 +18,7 @@ public class ComplianceScoreService {
     /**
      * Calculates a legal compliance score based on a hierarchical risk model.
      * * The calculation follows the Gatekeeper-Principle for severe risks and Exponential Decay
-     * for minor issues. If a CRITICAL_AGG violation is detected, the score is immediately 0
+     * for minor issues. If a CRITICAL or DSGVO violation is detected, the score is immediately 0
      * (Veto-Principle), as these represent non-negotiable legal liabilities.
      * * For transparency issues, the score is reduced multiplicatively using the formula
      * S(n) = 100 * 0.85^n. The decay factor of 0.85 is set to trigger a critical
@@ -39,16 +39,32 @@ protected int calculateLegalScore(List<ComplianceIssue> compliance) {
             .filter(i -> ComplianceCategory.CRITICAL_AGG == i.getCategory())
             .count();
 
+        long dsgvoCount = compliance
+            .stream()
+            .filter(i -> ComplianceCategory.DSGVO_MINIMIZATION == i.getCategory())
+            .count();
+
         if (criticalCount > 0) {
             return 0;
         }
 
+        if (dsgvoCount > 0) {
+            return 0;
+        }
+
         long transparencyCount = compliance
             .stream()
             .filter(i -> ComplianceCategory.TRANSPARENCY == i.getCategory())
             .count();
 
-        double score = 100.0 * Math.pow(PENALTY_FACTOR, transparencyCount);
+        long publicSectorCount = compliance
+            .stream()
+            .filter(i -> ComplianceCategory.PUBLIC_SECTOR == i.getCategory())
+            .count();
+
+        long totalCount = transparencyCount + publicSectorCount;
+
+        double score = 100.0 * Math.pow(PENALTY_FACTOR, totalCount);
         return (int) Math.max(0, Math.round(score));
     }
 
diff --git a/src/main/java/de/tum/cit/aet/ai/web/AiResource.java b/src/main/java/de/tum/cit/aet/ai/web/AiResource.java
index 957c1a98b7..7ff17b0ac4 100644
--- a/src/main/java/de/tum/cit/aet/ai/web/AiResource.java
+++ b/src/main/java/de/tum/cit/aet/ai/web/AiResource.java
@@ -2,13 +2,16 @@
 
 import de.tum.cit.aet.ai.domain.ComplianceIssue;
 import de.tum.cit.aet.ai.dto.ExtractedApplicationDataDTO;
+import de.tum.cit.aet.ai.dto.MapComplianceIssuesRequestDTO;
 import de.tum.cit.aet.ai.dto.TranslateComplianceDTO;
 import de.tum.cit.aet.ai.service.AiFeatureToggleService;
 import de.tum.cit.aet.ai.service.AiService;
 import de.tum.cit.aet.core.security.annotations.ApplicantOrAdmin;
 import de.tum.cit.aet.core.security.annotations.ProfessorOrEmployeeOrAdmin;
 import de.tum.cit.aet.job.dto.JobFormDTO;
+import jakarta.validation.Valid;
 import java.util.List;
+import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
@@ -70,7 +73,7 @@ public ResponseEntity<Flux<String>> generateJobApplicationDraftStream(
     @PutMapping(value = "translateJobDescriptionStream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public ResponseEntity<Flux<String>> translateJobDescriptionStream(
         @RequestParam("toLang") String toLang,
-        @RequestBody TranslateComplianceDTO request
+        @Valid @RequestBody TranslateComplianceDTO request
     ) {
         if (!aiFeatureToggleService.isAiAvailable()) {
             return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).build();
@@ -79,6 +82,22 @@ public ResponseEntity<Flux<String>> translateJobDescriptionStream(
         return ResponseEntity.ok(aiService.translateTextStream(request.text(), toLang));
     }
 
+    /**
+     * Maps compliance text snippets from original lang to target lang during stream-translate.
+     *
+     * @param request A DTO containing the text to translate
+     * @return a ResponseEntity of mapped snippets for target compliance analysis
+     */
+    @ProfessorOrEmployeeOrAdmin
+    @PostMapping(value = "map-compliance-issues", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<List<ComplianceIssue>> mapComplianceIssues(@Valid @RequestBody MapComplianceIssuesRequestDTO request) {
+        if (!aiFeatureToggleService.isAiAvailable()) {
+            return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).build();
+        }
+        log.info("POST /api/ai/map-compliance-issues - Compliance snippet-mapping request received (toLang={})", request.toLang());
+        return ResponseEntity.ok(aiService.mapComplianceIssues(request));
+    }
+
     /**
      * Extracts applicant data from PDF files using AI and persists the extracted
      * values into the application entity.
@@ -132,7 +151,7 @@ public ResponseEntity<List<ComplianceIssue>> analyzeJobDescriptionForCompliance(
         @RequestParam(defaultValue = "en") String userLanguage
     ) {
         // Service skips LLM calls internally when AI is disabled, rule-based gender bias analysis and score computation remain enabled
-        log.info("POST /api/ai/analyzeJobDescription - Request received (toLang={})", descriptionLanguage);
+        log.info("POST /api/ai/analyzeJobDescription - Compliance analysis request received (toLang={})", descriptionLanguage);
         return ResponseEntity.ok(aiService.analyzeCurrentJobDescription(jobForm, descriptionLanguage, userLanguage));
     }
 }
diff --git a/src/main/java/de/tum/cit/aet/job/service/JobService.java b/src/main/java/de/tum/cit/aet/job/service/JobService.java
index 231f80229f..1d7b57ceba 100644
--- a/src/main/java/de/tum/cit/aet/job/service/JobService.java
+++ b/src/main/java/de/tum/cit/aet/job/service/JobService.java
@@ -39,6 +39,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -543,30 +544,59 @@ public void updateJobDescriptionLanguage(String jobId, String toLang, String tra
     }
 
     /**
-     * Updates AI-generated analysis fields for a job.
+     * Updates AI-generated analysis fields for a job: replaces the compliance
+     * issues for the given language and overwrites the combined gender bias score.
      *
-     * @param jobId the job identifier
-     * @param score the combined AI score to persist
-     * @param complianceAnalysis the compliance issues detected for the job description
-     * @param lang the language for which existing issues should be replaced
+     * @param jobId               the job identifier
+     * @param score               the combined AI score to persist
+     * @param complianceAnalysis  compliance issues detected for the given language
+     * @param lang                the analyzed language ("de" or "en")
      */
     public void updateAiAnalysis(UUID jobId, int score, List<ComplianceIssue> complianceAnalysis, String lang) {
+        applyJobChangeForAnalysis(jobId, job -> {
+            replaceComplianceIssuesForLanguage(job, complianceAnalysis, lang);
+            job.setGenderBiasScore(score);
+        });
+    }
+
+    /**
+     * Replaces the compliance issues for a single language without touching the
+     * gender bias score. Used by the snippet-mapping flow, where the score has
+     * already been written by the source-language analysis and must not be reset.
+     *
+     * @param jobId               the job identifier
+     * @param complianceAnalysis  compliance issues for the target language
+     * @param lang                the target language ("de" or "en")
+     */
+    public void updateComplianceIssues(UUID jobId, List<ComplianceIssue> complianceAnalysis, String lang) {
+        applyJobChangeForAnalysis(jobId, job -> replaceComplianceIssuesForLanguage(job, complianceAnalysis, lang));
+    }
+
+    /**
+     * Loads the job, applies the given change, and persists in a single repository write.
+     */
+    private void applyJobChangeForAnalysis(UUID jobId, Consumer<Job> changes) {
         if (jobId == null) {
             return;
         }
-
         Job job = jobRepository.findByIdWithCompliance(jobId).orElseThrow(() -> EntityNotFoundException.forId("Job", jobId));
+        currentUserService.isAdminOrMemberOf(job.getResearchGroup());
+        changes.accept(job);
+        jobRepository.save(job);
+    }
 
-        // Keep issues from the other language, add new ones for target language
-        List issuesToSave = job
+    /**
+     * Replaces compliance issues for the given language.
+     * Issues from other languages stay unchanged.
+     * Updates the job in place and caller saves it.
+     */
+    private void replaceComplianceIssuesForLanguage(Job job, List<ComplianceIssue> complianceAnalysis, String lang) {
+        List<ComplianceIssue> issuesToSave = job
             .getComplianceIssues()
             .stream()
             .filter(issue -> !Objects.equals(issue.getLanguage(), lang))
             .collect(Collectors.toCollection(ArrayList::new));
-
         issuesToSave.addAll(complianceAnalysis);
-        job.setGenderBiasScore(score);
         job.setComplianceIssues(issuesToSave);
-        jobRepository.save(job);
     }
 }
diff --git a/src/main/resources/config/liquibase/changelog/00000000000052_add_suggestion_field_to_complianceIssue.xml b/src/main/resources/config/liquibase/changelog/00000000000052_add_suggestion_field_to_complianceIssue.xml
new file mode 100644
index 0000000000..f01653ed83
--- /dev/null
+++ b/src/main/resources/config/liquibase/changelog/00000000000052_add_suggestion_field_to_complianceIssue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+  <changeSet id="052_add_suggestion_field_to_complianceIssue" author="melissa">
+    <addColumn tableName="job_compliance_issues">
+      <column name="suggestion" type="text"/>
+    </addColumn>
+  </changeSet>
+
+</databaseChangeLog>
diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml
index 9e8760e0c1..2a9a3a2fd7 100644
--- a/src/main/resources/config/liquibase/master.xml
+++ b/src/main/resources/config/liquibase/master.xml
@@ -61,6 +61,7 @@
   <include file="changelog/00000000000049_add_recommendation_type_to_jobs.xml" relativeToChangelogFile="true"/>
   <include file="changelog/00000000000050_create_ai_usage_events.xml" relativeToChangelogFile="true"/>
   <include file="changelog/00000000000051_make_document_uploaded_by_nullable.xml" relativeToChangelogFile="true"/>
+  <include file="changelog/00000000000052_add_suggestion_field_to_complianceIssue.xml" relativeToChangelogFile="true"/>
 
   <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->
   <!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints
diff --git a/src/main/resources/prompts/AnalyzeComplianceText.st b/src/main/resources/prompts/AnalyzeComplianceText.st
index 81be2bbdc7..4329f89b04 100644
--- a/src/main/resources/prompts/AnalyzeComplianceText.st
+++ b/src/main/resources/prompts/AnalyzeComplianceText.st
@@ -1,51 +1,74 @@
 You are the DocApply ComplianceReader, an advanced AI legal and compliance expert for academic job postings at a prestigious university.
 Your core capability is "Contextual Compliance Detection" based on German and EU law.
 You analyze the semantic intent and the exclusionary effect of sentences, not just keywords.
+Your task is to apply the following policy exactly. Do not substitute your own legal interpretation. If this policy differs from your own knowledge, FOLLOW this policy.
 
 TASK:
 Deeply analyze the job posting for legal risks (AGG, DSGVO, WissZeitVG) based on German and EU law.
 The input description language is: {descriptionLanguage}.
-The explanation must be written in: {userLang}.
+EXPLANATIONS must be written in: {userLang}.
+SUGGESTIONS must be written in: {descriptionLanguage}.
 
-STRICT ANALYSIS RULES:
-
-1. NO SUMMARIES: Every single violation must be a separate JSON object.
-2. ALWAYS deeply analyze for CONTEXTUAL and IMPLICIT Discrimination in context of a recruitment system.
-   If a text implies SUBTEXT and EXCLUSIONARY EFFECT, it is a violation
-----------------------
-3. CATEGORY CRITICAL_AGG:
-  - Detect discrimination by protected characteristics under section 1 AGG.
-  - Detect exclusion based on disability, age, origin, or gender.
-  - JOB TITLE CHECK: If title "{title}" is not gender-neutral with "(m/f/d)" or "(m/w/d)", flag it.
-  - action: REPLACE
+SSTRICT ANALYSIS RULES:
+ 1. NO SUMMARIES: Every single violation must be a separate JSON object.
+ 2. CONTEXTUAL & IMPLICIT DISCRIMINATION: Test the exclusionary effect of the subtext. If a phrase implies that a protected group (age, origin, disability, gender) would not "fit", it is a CRITICAL_AGG violation.
+ 3. MINIMAL SNIPPETS: Extract the ABSOLUTE MINIMUM amount of words needed. Never extract whole sentences if a phrase suffices. NO OVERLAPPING text snippets between issues.
+ 4. LEGAL EXCEPTIONS: Affirmative action phrases for women or disabled individuals under equal qualifications (§ 5 AGG, BGleiG, SGB IX) are legally mandated. NEVER flag them.
+ 5. SEAMLESS GRAMMAR: Suggestions must perfectly match capitalization, punctuation, and grammatical case of the original text without breaking the sentence.
+ 6. VAGUE LANGUAGE = DISCRIMINATION (AGG): Subjective language requirements (e.g., "good", "fluent") lack objective measurability and pose an implicit risk of origin-based discrimination. You MUST flag these. DO NOT flag objective standards (e.g., CEFR levels like B2, C1).
+ 7. EXHAUSTIVE MULTI-PASS SCAN: You must evaluate EVERY single sentence independently. A standard job posting contains multiple distinct violations across different categories. Do not stop after finding the first issue. You must find all of them.
 ----------------------
-4. CATEGORY DSGVO_MINIMIZATION:
+CATEGORIES & ACTIONS:
+
+1. CRITICAL_AGG (action: REPLACE):
+  - FOCUS: Explicit discrimination (§ 1 AGG) OR implicit exclusion via unmeasurable, subjective requirements.
+  - TRIGGER: Any requirement regarding age, gender, heritage, physical state, OR subjective language skills without a formal framework.
+  - SUGGESTION: Provide the exact safe alternative. For language, substitute with a standard CEFR level (e.g., "English skills min. at B2 level").
+2. DSGVO_MINIMIZATION (action: REMOVE):
+  - FOCUS: Data INTAKE & Collection (Art. 5 GDPR).
+    - TRIGGER 1: The employer explicitly asks the applicant to submit sensitive/unnecessary data (e.g., marital status, photos, religion).
+    - TRIGGER 2: The employer forces the applicant to apply via external, generic website links or unverified forms where data collection is not minimized or controlled.
+    - RULE: This category is ONLY about what the applicant is asked to PROVIDE or WHERE they must submit it.
   - Scan for violations of Data Minimization (Art. 5 DSGVO).
-  - Detect for keyword that specifically ask for personal DATA (e.g., photos, ID copies, criminal records, marital status, religion)
-  - EXTERNAL LINK CHECK: Detect for external application forms or websites and flag them
-  - action: REMOVE
-----------------------
-5. CATEGORY TRANSPARENCY:
+3. TRANSPARENCY (action: ADD):
+  - FOCUS: Data OUTFLOW & Sharing (Art. 13/14 GDPR).
   - Detect mentions of THIRD PARTIES/TOOLS (Workday, Headhunter, Partner Uni, consortia) without stating that data is shared with them.
-  - NOT triggered by: When explicit DATA is requested from the applicant.
-  - action: Suggest to ADD a message that clarifies whether applicant data is shared with external recipients (Art. 13 DSGVO)
-----------------------
-6. CATEGORY PUBLIC_SECTOR: (WissZeitVG)
-  - PhD Specific QUALIFICATION PURPOSE: For PhD/Academic positions, the text MUST semantically imply that the position serves scientific qualification (Wissenschaftliche Qualifizierung/Promotion).
-  - If the intent of individual research/promotion is missing, it is a violation.
-  - action: ADD
-----------------------
+  - If entire jobDescription does NOT contain a sentence clarifying that applicant data is shared with external recipients, flag detected mention
+  - NOT triggered by: When explicit DATA is requested from the applicant. DO NOT confuse this with MINIMIZATION. Do not flag links here. Flag the MENTION of external partners.
+  - TRANSPARENCY SUGGESTION: suggestion must be a consent-based sentence like: By applying, you consent to your data being shared with "third party" for the purpose of the application process (Art. 13 DSGVO)
+  - Before reporting an ADD issue, check the entire description for an equivalent disclosure. Never suggest information that is already present, even with different wording.
+  - Every ADD suggestion must be one grammatically independent, complete sentence. Never start it with a comma, conjunction, or subordinate clause.
+4. PUBLIC_SECTOR (action: ADD):
+  - FOCUS: Qualification Purpose (WissZeitVG).
+  - PhD Specific QUALIFICATION PURPOSE (WissZeitVG): For PhD/Academic positions, the text MUST semantically imply that the position serves scientific qualification (Wissenschaftliche Qualifizierung/Promotion).
+  - RULE: Anchor your suggestion to the heading "Description" or "Beschreibung" if the intent is missing. Do not flag if already present.
+  - Do not report this issue when the description already states that the position supports a doctorate, promotion, or scientific qualification.
+-----------
+-----------
 INPUT TEXT:
 {title}
 {jobDescription}
 ----------------------
+
+COMPLETENESS REQUIREMENT:
+Before returning the JSON, you MUST internally conduct 4 separate passes over the ENTIRE text:
+Pass 1: Check every sentence for implicit/explicit AGG and vague language skills.
+Pass 2: Check every sentence for uncontrolled data intake or external URLs (Minimization).
+Pass 3: Check every sentence for mentions of external collaborators without privacy clauses (Transparency).
+Pass 4: Check for WissZeitVG purpose.
+The output MUST contain the combined findings of all passes.
+
 OUTPUT:
-  - Return ONLY a valid JSON array. No markdown. No prose.
-  - One object per issue
-  - Object fields must be exactly:
-    id, text, category, article, explanation, action
+  Return ONLY a valid JSON array. No markdown. No prose.
+  Object fields must be exactly:
+    id, text, category, article, explanation, action, suggestion
   - category must be exactly CRITICAL_AGG, TRANSPARENCY, DSGVO_MINIMIZATION or PUBLIC_SECTOR
+  - article: the relevant legal article
+  - text: The exact, shortest possible substring from the input triggering the violation (plain text).
+  - explanation: Explain explicitly WHY the snippet is a legal violation, linking the error directly to the legal basis. STRICT LIMIT: 15 words. Must sound like a formal legal objection, not just a label.
   - action must be exactly REPLACE or ADD or REMOVE.
-  - text: MAXIMUM 2-4 WORDS. Extract exact snippet from input text that uniquely identifies the violation (plain text, no HTML tags).
-  - explanation must be a single SHORT sentence stating the legal violation directly. Sound like a formal legal notice.
-  - If no issues exist, return exactly [].
+  - suggestion: The exact string to fix the issue
+    - For action is ADD: Return one concise sentence to append the text snippet as an grammatical continuation that starts exactly where the "text" snippet ends.
+    - For action is REPLACE: The exact safe alternative. Preserve the original meaning as far as legally possible. Match original capitalization exactly.
+    - For action is REMOVE: return an empty string ""
+  If no issues exist, return exactly [].
diff --git a/src/main/resources/prompts/SnippetMapping.st b/src/main/resources/prompts/SnippetMapping.st
new file mode 100644
index 0000000000..1ace872aa4
--- /dev/null
+++ b/src/main/resources/prompts/SnippetMapping.st
@@ -0,0 +1,21 @@
+For each issue below, find the matching phrase in the translated text and translate its suggestion into {targetLanguage}.
+Return a flat JSON array of strings in the same issue order: mapped text, translated suggestion, mapped text, translated suggestion.
+Mapped text must be copied verbatim from the translated text. If a suggestion is empty, return an empty string for it.
+Return only valid JSON, no markdown and no explanations.
+
+Example:
+Original: "Wir suchen nach jungen Kandidaten."
+Translated: "We are looking for young candidates."
+Issues:
+Text: jungen Kandidaten
+Suggestion: qualifizierten Personen
+Output: ["young candidates", "qualified people"]
+
+Original text:
+{jobDescription}
+
+Translated text:
+{translatedText}
+
+Issues:
+{issues}
diff --git a/src/main/webapp/app/generated/.openapi-generator/FILES b/src/main/webapp/app/generated/.openapi-generator/FILES
index db7d82624d..7fab6e15f2 100644
--- a/src/main/webapp/app/generated/.openapi-generator/FILES
+++ b/src/main/webapp/app/generated/.openapi-generator/FILES
@@ -130,6 +130,7 @@ model/job-preview-request.ts
 model/keycloak-config.ts
 model/keycloak-user-dto.ts
 model/login-request-dto.ts
+model/map-compliance-issues-request-dto.ts
 model/otp-complete-dto.ts
 model/otp-config.ts
 model/overall-recommendation.ts
diff --git a/src/main/webapp/app/generated/api/ai-resource-api.ts b/src/main/webapp/app/generated/api/ai-resource-api.ts
index adb9c54e97..4d9c696f86 100644
--- a/src/main/webapp/app/generated/api/ai-resource-api.ts
+++ b/src/main/webapp/app/generated/api/ai-resource-api.ts
@@ -18,6 +18,7 @@ import { Observable } from 'rxjs';
 import { ComplianceIssue } from '../model/compliance-issue';
 import { JobFormDTO } from '../model/job-form-dto';
 import { ExtractedApplicationDataDTO } from '../model/extracted-application-data-dto';
+import { MapComplianceIssuesRequestDTO } from '../model/map-compliance-issues-request-dto';
 import { TranslateComplianceDTO } from '../model/translate-compliance-dto';
 
 @Injectable({ providedIn: 'root' })
@@ -93,6 +94,16 @@ export class AiResourceApi {
         return this.http.put<Array<string>>(url, jobFormDTO);
     }
 
+    /**
+     * 
+     * 
+     * @param mapComplianceIssuesRequestDTO 
+     */
+    mapComplianceIssues(mapComplianceIssuesRequestDTO: MapComplianceIssuesRequestDTO): Observable<Array<ComplianceIssue>> {
+        const url = `${this.basePath}/api/ai/map-compliance-issues`;
+        return this.http.post<Array<ComplianceIssue>>(url, mapComplianceIssuesRequestDTO);
+    }
+
     /**
      * 
      * 
diff --git a/src/main/webapp/app/generated/model/compliance-issue.ts b/src/main/webapp/app/generated/model/compliance-issue.ts
index 42922fd5ba..169a9af5d0 100644
--- a/src/main/webapp/app/generated/model/compliance-issue.ts
+++ b/src/main/webapp/app/generated/model/compliance-issue.ts
@@ -16,6 +16,7 @@ export interface ComplianceIssue {
     readonly explanation?: string;
     readonly id?: string;
     readonly language?: string;
+    readonly suggestion?: string;
     readonly text?: string;
 }
 
diff --git a/src/main/webapp/app/generated/model/map-compliance-issues-request-dto.ts b/src/main/webapp/app/generated/model/map-compliance-issues-request-dto.ts
new file mode 100644
index 0000000000..0335813807
--- /dev/null
+++ b/src/main/webapp/app/generated/model/map-compliance-issues-request-dto.ts
@@ -0,0 +1,19 @@
+/**
+ * OpenAPI definition
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * API Version: v0
+ * 
+ *
+ * NOTE: This file is auto-generated. Do not edit manually.
+ */
+
+import type { ComplianceIssue } from './compliance-issue';
+
+export interface MapComplianceIssuesRequestDTO {
+    readonly complianceIssues: Array<ComplianceIssue>;
+    readonly jobId?: string;
+    readonly text: string;
+    readonly toLang?: string;
+    readonly translatedText: string;
+}
diff --git a/src/main/webapp/app/job/job-creation-form/job-creation-form.component.html b/src/main/webapp/app/job/job-creation-form/job-creation-form.component.html
index b4b068c6d1..e60715f1b5 100644
--- a/src/main/webapp/app/job/job-creation-form/job-creation-form.component.html
+++ b/src/main/webapp/app/job/job-creation-form/job-creation-form.component.html
@@ -191,7 +191,14 @@ <h1 jhiTranslate="{{ pageTitle() }}"></h1>
                   height="20rem"
                   (highlightHovered)="onHighlightHovered($event)"
                 />
-                <jhi-compliance-popover [issue]="activePopoverIssue()" [x]="popoverX()" [y]="popoverY()" />
+                <jhi-compliance-popover
+                  [issue]="activePopoverIssue()"
+                  [x]="popoverX()"
+                  [y]="popoverY()"
+                  (closed)="closeCompliancePopover()"
+                  (accept)="onComplianceSuggestionAccepted($event)"
+                  (dismiss)="onComplianceIssueDismissed($event)"
+                />
               </div>
             </div>
           </div>
diff --git a/src/main/webapp/app/job/job-creation-form/job-creation-form.component.ts b/src/main/webapp/app/job/job-creation-form/job-creation-form.component.ts
index c00f5f2f92..3b99b2b718 100644
--- a/src/main/webapp/app/job/job-creation-form/job-creation-form.component.ts
+++ b/src/main/webapp/app/job/job-creation-form/job-creation-form.component.ts
@@ -45,6 +45,7 @@ import { ResearchGroupResourceApi } from 'app/generated/api/research-group-resou
 import { parseLocalDateString } from 'app/shared/util/date-time.util';
 import { extractCompleteHtmlTags, unescapeJsonString } from 'app/shared/util/util';
 import { extractTextFromHtml, hasText } from 'app/shared/util/text.util';
+import { applyComplianceSuggestionToHtml } from 'app/shared/util/compliance-suggestion.util';
 import {
   ImageUploadButtonComponent,
   ImageUploadError,
@@ -212,6 +213,12 @@ export class JobCreationFormComponent {
   /** Last analyzed description text per language (used to avoid redundant compliance analysis) */
   private lastAnalyzedText: Record<string, string> = {};
 
+  /** Reuses an identical compliance analysis while its request is still running. */
+  private readonly activeAnalysisRequests = new Map<string, Promise<ComplianceIssue[] | undefined>>();
+
+  /** Accepted source issues waiting for their target-language mapping. */
+  private readonly pendingMappedActions = new Set<string>();
+
   // ═══════════════════════════════════════════════════════════════════════════
   // AI GENERATION SIGNALS
   // ═══════════════════════════════════════════════════════════════════════════
@@ -325,9 +332,21 @@ export class JobCreationFormComponent {
   /** Vertical screen position of popover. */
   readonly popoverY = signal<number>(0);
 
+  /** Close the fixed popover when its highlighted anchor moves due to scrolling. */
+  private readonly closePopoverOnScrollEffect = effect(onCleanup => {
+    if (this.activePopoverIssue() === undefined) return;
+
+    const closePopover = (): void => this.closeCompliancePopover();
+    document.addEventListener('scroll', closePopover, true);
+    onCleanup(() => document.removeEventListener('scroll', closePopover, true));
+  });
+
   /** When set, only issues of this category are highlighted in the editor. (undefined = all categories shown) */
   readonly activeComplianceFilter = signal<string | undefined>(undefined);
 
+  /** Dismiss hides the marker, but keeps the issue in score/count. */
+  readonly dismissedComplianceHighlights = signal<ComplianceIssue[]>([]);
+
   /** Returns the explanation of a compliance issue whose text appears in the job title, if any. */
   readonly titleComplianceError = computed(() => {
     this.basicInfoFormValueSignal();
@@ -933,8 +952,12 @@ export class JobCreationFormComponent {
    * @param lang The current language of the editor content
    */
   private applyHighlights(compliance: ComplianceIssue[] | undefined, lang: string): void {
+    const dismissedIssues = this.dismissedComplianceHighlights();
     const highlights = (compliance ?? []).flatMap(issue =>
-      hasText(issue.text) && issue.category !== undefined && (!hasText(issue.language) || issue.language === lang)
+      !dismissedIssues.includes(issue) &&
+      hasText(issue.text) &&
+      issue.category !== undefined &&
+      (!hasText(issue.language) || issue.language === lang)
         ? [{ text: issue.text, category: issue.category }]
         : [],
     );
@@ -947,7 +970,6 @@ export class JobCreationFormComponent {
    */
   onHighlightHovered(event: { text: string; x: number; y: number } | undefined): void {
     if (!event) {
-      this.activePopoverIssue.set(undefined);
       return;
     }
     const lang = this.currentDescriptionLanguage();
@@ -957,6 +979,72 @@ export class JobCreationFormComponent {
     this.popoverY.set(event.y);
   }
 
+  /**
+   * Applies the action of an accepted AI compliance suggestion to the editor.
+   * Applies a mapped suggestion to both descriptions and removes both language
+   * variants from the compliance UI.
+   */
+  onComplianceSuggestionAccepted(issue: ComplianceIssue): void {
+    const updatedHtml = this.jobDescriptionEditor()?.applyComplianceSuggestion(issue);
+    if (updatedHtml === undefined) return;
+
+    const lang = this.currentDescriptionLanguage();
+    const pairedIssue = hasText(issue.id)
+      ? this.complianceIssues().find(candidate => candidate !== issue && candidate.id === issue.id && candidate.language !== lang)
+      : undefined;
+
+    let updatedEN = lang === 'en' ? updatedHtml : this.jobDescriptionEN();
+    let updatedDE = lang === 'de' ? updatedHtml : this.jobDescriptionDE();
+    if (pairedIssue) {
+      const pairedHtml = applyComplianceSuggestionToHtml(pairedIssue.language === 'en' ? updatedEN : updatedDE, pairedIssue);
+      if (pairedHtml !== undefined) {
+        if (pairedIssue.language === 'en') updatedEN = pairedHtml;
+        else updatedDE = pairedHtml;
+      }
+    } else if (hasText(issue.id)) {
+      this.pendingMappedActions.add(issue.id);
+    }
+
+    this.jobDescriptionEN.set(updatedEN);
+    this.jobDescriptionDE.set(updatedDE);
+    this.lastTranslatedEN.set(updatedEN.trim());
+    this.lastTranslatedDE.set(updatedDE.trim());
+    this.basicInfoForm.get('jobDescription')?.setValue(updatedHtml);
+
+    this.complianceIssues.update(issues => issues.filter(candidate => candidate !== issue && candidate !== pairedIssue));
+    this.closeCompliancePopover();
+    this.refreshComplianceHighlights();
+  }
+
+  /**
+   * Dismisses a compliance issue without applying it.
+   * The highlight disappears from the editor, but the issue still counts
+   * toward the score and the sidebar total.
+   */
+  onComplianceIssueDismissed(issue: ComplianceIssue): void {
+    this.dismissedComplianceHighlights.update(issues => issues.concat(issue));
+    this.closeCompliancePopover();
+    this.refreshComplianceHighlights();
+  }
+
+  /**
+   * Renders compliance highlights in the editor based on the current
+   * language and active category filter. Called after issues change
+   * when action state or filter changes.
+   */
+  private refreshComplianceHighlights(): void {
+    const lang = this.currentDescriptionLanguage();
+    const category = this.activeComplianceFilter();
+    const visibleIssues =
+      category !== undefined ? this.complianceIssues().filter(currentIssue => currentIssue.category === category) : this.complianceIssues();
+    this.applyHighlights(visibleIssues, lang);
+  }
+
+  /** Hides the active compliance popover and clears its hover state. */
+  closeCompliancePopover(): void {
+    this.activePopoverIssue.set(undefined);
+  }
+
   /**
    * Handles category filter changes from the AI assistant sidebar.
    * Updates filter signal to show only the selected category
@@ -1109,7 +1197,7 @@ export class JobCreationFormComponent {
 
       // 3) Analyze source language first so the user sees highlights + score immediately.
       if (this.aiToggleSignal() && this.aiSystemEnabled()) {
-        void Promise.all([this.analyzeAndUpdateScore(sourceLang), this.translateAndStoreOtherLanguage(sourceLang, sourceText)]);
+        this.processDescriptionWithAi(sourceLang, sourceText);
       }
     } catch {
       this.autoSave.setState(SavingStates.FAILED);
@@ -1655,12 +1743,11 @@ export class JobCreationFormComponent {
       this.jobDescriptionEN.set(saved.jobDescriptionEN ?? this.jobDescriptionEN());
       this.jobDescriptionDE.set(saved.jobDescriptionDE ?? this.jobDescriptionDE());
 
-      // 4) Fire translation (fire-and-forget). Analysis runs once at the end
-      //    of translation after both languages are available — avoids duplicate
-      //    analysis calls that cause score flash issues.
+      // 4) Start source analysis and translation in parallel. The source analysis
+      //    renders highlights as soon as it finishes; target issues are mapped
+      //    after both results are available, without a second full analysis.
       if (this.aiToggleSignal() && this.aiSystemEnabled()) {
-        // highlighting before translation
-        void Promise.all([this.analyzeAndUpdateScore(currentLang), this.translateAndStoreOtherLanguage(currentLang, description)]);
+        this.processDescriptionWithAi(currentLang, description);
       }
       return true;
     } catch {
@@ -1696,6 +1783,15 @@ export class JobCreationFormComponent {
     return saved;
   }
 
+  /**
+   * Starts the only full compliance analysis and the translation concurrently.
+   * Translation then reuses the source issues to map exact target-language snippets.
+   */
+  private processDescriptionWithAi(sourceLang: Language, sourceText: string): void {
+    const sourceIssues = this.analyzeAndUpdateScore(sourceLang);
+    void this.translateAndStoreOtherLanguage(sourceLang, sourceText, sourceIssues);
+  }
+
   /**
    * Translates the job description to the other language via SSE streaming.
    * Supports cancellation (new edits cancel the previous translation) and
@@ -1703,10 +1799,17 @@ export class JobCreationFormComponent {
    *
    * @param currentLang - The language the user wrote in ('en' or 'de')
    * @param currentText - The source text to translate
+   * @param sourceIssuesPromise - The concurrently running source-language analysis
    */
-  private async translateAndStoreOtherLanguage(currentLang: Language, currentText: string): Promise<void> {
+  private async translateAndStoreOtherLanguage(
+    currentLang: Language,
+    currentText: string,
+    sourceIssuesPromise: Promise<ComplianceIssue[] | undefined>,
+  ): Promise<void> {
     const text = currentText.trim();
     if (!text) return;
+    const jobId = this.jobId();
+    if (!jobId) return;
 
     const targetLang: Language = currentLang === 'en' ? 'de' : 'en';
     // If an identical translation is already in flight, skips the call to avoid a redundant LLM request.
@@ -1717,7 +1820,15 @@ export class JobCreationFormComponent {
 
     // 1) Skip if the text hasn't changed since the last translation
     const lastBaseline = currentLang === 'en' ? this.lastTranslatedEN() : this.lastTranslatedDE();
-    if (text === lastBaseline) return;
+    if (text === lastBaseline) {
+      const targetHtml = targetLang === 'en' ? this.jobDescriptionEN() : this.jobDescriptionDE();
+      try {
+        await this.mapIssuesToTargetLanguage(text, targetLang, targetHtml, sourceIssuesPromise, jobId);
+      } catch {
+        // Silent mapping failure — the next analysis can retry without retranslating.
+      }
+      return;
+    }
 
     // 2) Cancel any active translation and set up fresh state
     this.cancelTranslation();
@@ -1756,8 +1867,9 @@ export class JobCreationFormComponent {
       );
 
       let hasTranslation = false;
+      let finalContent: string | null = null;
       if (accumulatedContent) {
-        const finalContent = this.extractTranslatedTextFromStream(accumulatedContent);
+        finalContent = this.extractTranslatedTextFromStream(accumulatedContent);
 
         if (finalContent !== null && finalContent.length > 0) {
           hasTranslation = true;
@@ -1781,28 +1893,22 @@ export class JobCreationFormComponent {
         }
       }
 
-      // 7) Streaming is done. For the active run, hand off from "translating" to
-      //    "analyzing": pre-set isAnalyzing so the sidebar score keeps loading,
-      //    then clear the translation spinner so the editor shows the finished
-      //    translation immediately instead of waiting for compliance analysis.
-      const jobId = this.jobId();
-      const runAnalysis = this.translationAbortController === abortController && hasTranslation && !!jobId;
-      if (runAnalysis) {
-        this.isAnalyzing.set(true);
-      }
+      // 7) Streaming is done. Clear the translation spinner immediately; source
+      //    analysis and target snippet mapping continue independently.
+      const mapIssues = this.translationAbortController === abortController && hasTranslation;
       this.clearTranslationState(abortController, activeRequest);
 
-      // 8) Persist the translated content and run compliance analysis for the
-      //    freshly translated language, decoupled from the translation spinner.
-      if (runAnalysis) {
+      // 8) Persist the translated content, then map the already detected source
+      //    snippets onto it. This replaces the former second compliance analysis.
+      if (mapIssues) {
         try {
           const currentData = this.createJobDTO(JobFormDTOStateEnum.Draft);
           const saved = await firstValueFrom(this.jobApi.updateJob(jobId, currentData));
           this.lastSavedData.set(saved);
-          await this.analyzeAndUpdateScore(targetLang);
+
+          await this.mapIssuesToTargetLanguage(text, targetLang, finalContent ?? '', sourceIssuesPromise, jobId);
         } catch {
           // Silent save failure — will be caught by next autosave
-          this.isAnalyzing.set(false);
         }
       }
     } catch (e) {
@@ -1814,57 +1920,133 @@ export class JobCreationFormComponent {
     }
   }
 
+  /** Maps source issues to an existing target text and applies actions accepted while mapping was pending. */
+  private async mapIssuesToTargetLanguage(
+    sourceText: string,
+    targetLang: Language,
+    targetHtml: string,
+    sourceIssuesPromise: Promise<ComplianceIssue[] | undefined>,
+    jobId: string,
+  ): Promise<void> {
+    const sourceIssues = await sourceIssuesPromise;
+    if (sourceIssues === undefined) return;
+
+    const hasTargetIssues = this.complianceIssues().some(issue => issue.language === targetLang);
+    let mappedIssues: ComplianceIssue[] = [];
+    if (sourceIssues.length > 0 || hasTargetIssues) {
+      mappedIssues = await firstValueFrom(
+        this.aiApi.mapComplianceIssues({
+          toLang: targetLang,
+          jobId,
+          text: extractTextFromHtml(sourceText),
+          translatedText: extractTextFromHtml(targetHtml),
+          complianceIssues: sourceIssues,
+        }),
+      );
+    }
+
+    const acceptedMappedIssues = mappedIssues.filter(issue => hasText(issue.id) && this.pendingMappedActions.has(issue.id));
+    const appliedMappedIssues: ComplianceIssue[] = [];
+    for (const acceptedIssue of acceptedMappedIssues) {
+      const currentTargetHtml = targetLang === 'en' ? this.jobDescriptionEN() : this.jobDescriptionDE();
+      const updatedTargetHtml = applyComplianceSuggestionToHtml(currentTargetHtml, acceptedIssue);
+      if (updatedTargetHtml === undefined) continue;
+
+      this.pendingMappedActions.delete(acceptedIssue.id!);
+      appliedMappedIssues.push(acceptedIssue);
+      if (targetLang === 'en') this.jobDescriptionEN.set(updatedTargetHtml);
+      else this.jobDescriptionDE.set(updatedTargetHtml);
+      this.lastTranslatedEN.set(this.jobDescriptionEN().trim());
+      this.lastTranslatedDE.set(this.jobDescriptionDE().trim());
+
+      if (this.currentDescriptionLanguage() === targetLang) {
+        this.basicInfoForm.get('jobDescription')?.setValue(updatedTargetHtml, { emitEvent: false });
+        this.jobDescriptionSignal.set(updatedTargetHtml);
+        this.jobDescriptionEditor()?.forceUpdate(updatedTargetHtml);
+      }
+    }
+    if (appliedMappedIssues.length > 0) this.autoSave.notifyChanged();
+
+    const visibleMappedIssues = mappedIssues.filter(issue => !appliedMappedIssues.includes(issue));
+    const otherIssues = this.complianceIssues().filter(issue => issue.language !== targetLang);
+    this.complianceIssues.set(otherIssues.concat(visibleMappedIssues));
+
+    if (this.currentDescriptionLanguage() === targetLang) {
+      this.applyHighlights(visibleMappedIssues, targetLang);
+    }
+  }
+
   /**
    * Runs compliance analysis on the job description for the given language
    * and updates the inclusivity score in the sidebar.
    *
    * @param lang - The language to analyze ('en' or 'de')
    */
-  private async analyzeAndUpdateScore(lang: string): Promise<void> {
+  private async analyzeAndUpdateScore(lang: string): Promise<ComplianceIssue[] | undefined> {
     const jobId = this.jobId();
-    if (!jobId) return;
+    if (!jobId) return undefined;
 
     // 1) Build a fresh DTO and skip if the description hasn't changed since last analysis
     const jobForm = this.createJobDTO(JobFormDTOStateEnum.Draft);
     const userLang = this.translate.getCurrentLang();
     const descriptionText = lang === 'en' ? (jobForm.jobDescriptionEN ?? '') : (jobForm.jobDescriptionDE ?? '');
-    if (!descriptionText.trim() || descriptionText === this.lastAnalyzedText[lang]) {
-      this.isAnalyzing.set(false); // Clear flag in case caller pre-set it
-      return;
+    if (!descriptionText.trim()) {
+      this.isAnalyzing.set(this.activeAnalysisRequests.size > 0);
+      return undefined;
+    }
+    if (descriptionText === this.lastAnalyzedText[lang]) {
+      this.isAnalyzing.set(this.activeAnalysisRequests.size > 0);
+      return this.complianceIssues().filter(issue => issue.language === lang);
     }
 
+    const requestKey = `${lang}\u0000${descriptionText}`;
+    const activeRequest = this.activeAnalysisRequests.get(requestKey);
+    if (activeRequest) return activeRequest;
+
     this.isAnalyzing.set(true);
-    try {
-      // 2) Send the description to the analysis endpoint (persists score on the backend)
-      const compliance = await firstValueFrom(this.aiApi.analyzeJobDescriptionForCompliance(lang, jobForm, userLang));
-      this.lastAnalyzedText[lang] = descriptionText;
-      // Keep issues from other languages, but replace all issues for the current language with the latest analysis.
-      const otherLang = lang === 'en' ? 'de' : 'en';
-      const existingLang = this.complianceIssues().filter(issue => issue.language === otherLang);
-
-      this.complianceIssues.set(existingLang.concat(compliance));
-
-      // 3) Fetch the updated job to retrieve the persisted score.
-      //    Retry once with a short delay if the score is still missing
-      //    (DB transaction may not have committed yet).
-      for (let attempt = 0; attempt < 2; attempt++) {
-        const updatedJob = await firstValueFrom(this.jobApi.getJobById(jobId));
-        if (updatedJob.genderBiasScore !== undefined) {
-          this.aiScore.set(updatedJob.genderBiasScore);
-          break;
+    const request = (async (): Promise<ComplianceIssue[] | undefined> => {
+      try {
+        // 2) Send the description to the analysis endpoint (persists score on the backend)
+        const compliance = await firstValueFrom(this.aiApi.analyzeJobDescriptionForCompliance(lang, jobForm, userLang));
+        this.lastAnalyzedText[lang] = descriptionText;
+        // Keep issues from other languages, but replace all issues for the current language with the latest analysis.
+        const otherLang = lang === 'en' ? 'de' : 'en';
+        const existingLang = this.complianceIssues().filter(issue => issue.language === otherLang);
+
+        this.complianceIssues.set(existingLang.concat(compliance));
+
+        // 3) Fetch the updated job to retrieve the persisted score.
+        //    Retry once with a short delay if the score is still missing
+        //    (DB transaction may not have committed yet).
+        for (let attempt = 0; attempt < 2; attempt++) {
+          const updatedJob = await firstValueFrom(this.jobApi.getJobById(jobId));
+          if (updatedJob.genderBiasScore !== undefined) {
+            this.aiScore.set(updatedJob.genderBiasScore);
+            break;
+          }
+          if (attempt === 0) {
+            await new Promise(resolve => setTimeout(resolve, 500));
+          }
         }
-        if (attempt === 0) {
-          await new Promise(resolve => setTimeout(resolve, 500));
+        const currentLang = this.currentDescriptionLanguage();
+        if (currentLang === lang) {
+          this.applyHighlights(compliance, lang);
         }
+        return compliance;
+      } catch {
+        this.toastService.showErrorKey('jobCreationForm.toastMessages.aiComplianceFailed');
+        return undefined;
       }
-      const currentLang = this.currentDescriptionLanguage();
-      if (currentLang === lang) {
-        this.applyHighlights(compliance, lang);
-      }
-    } catch {
-      this.toastService.showErrorKey('jobCreationForm.toastMessages.aiComplianceFailed');
+    })();
+    this.activeAnalysisRequests.set(requestKey, request);
+
+    try {
+      return await request;
     } finally {
-      this.isAnalyzing.set(false);
+      if (this.activeAnalysisRequests.get(requestKey) === request) {
+        this.activeAnalysisRequests.delete(requestKey);
+      }
+      this.isAnalyzing.set(this.activeAnalysisRequests.size > 0);
     }
   }
 
diff --git a/src/main/webapp/app/shared/components/atoms/editor/editor.component.ts b/src/main/webapp/app/shared/components/atoms/editor/editor.component.ts
index bc0ed0ef40..0277104404 100644
--- a/src/main/webapp/app/shared/components/atoms/editor/editor.component.ts
+++ b/src/main/webapp/app/shared/components/atoms/editor/editor.component.ts
@@ -6,6 +6,7 @@ import { TooltipModule } from 'primeng/tooltip';
 import { ContentChange, QuillEditorComponent } from 'ngx-quill';
 import { FormsModule } from '@angular/forms';
 import { extractTextFromHtml } from 'app/shared/util/text.util';
+import { findSentenceEnd } from 'app/shared/util/compliance-suggestion.util';
 import { GenderBiasAnalysisService } from 'app/shared/gender-bias-analysis/gender-bias-analysis';
 import { GenderBiasAnalysisResponse } from 'app/generated/model/gender-bias-analysis-response';
 import { toObservable, toSignal } from '@angular/core/rxjs-interop';
@@ -17,7 +18,12 @@ import { InfoIconComponent } from 'app/shared/components/atoms/info-icon/info-ic
 import { ChangeDetectorRef } from '@angular/core';
 import { viewChild } from '@angular/core';
 import { TranslateDirective } from 'app/shared/language';
-import { ComplianceIssueCategoryEnum, ComplianceIssueCategoryEnumValues } from 'app/generated/model/compliance-issue';
+import {
+  ComplianceIssue,
+  ComplianceIssueActionEnum,
+  ComplianceIssueCategoryEnum,
+  ComplianceIssueCategoryEnumValues,
+} from 'app/generated/model/compliance-issue';
 
 import { BaseInputDirective } from '../base-input/base-input.component';
 
@@ -419,6 +425,47 @@ export class EditorComponent extends BaseInputDirective<string> {
     }
   }
 
+  /**
+   * Applies an AI compliance suggestion to the current editor content based on compliance action.
+   * - `Replace`: swaps the target snippet with the suggestion
+   * - `Remove`: deletes the target snippet
+   * - `Add`: inserts the suggestion after the target snippet
+   *
+   * @param issue The compliance issue containing the action, snippet text, and suggestion.
+   * @returns The updated editor HTML for issued text snippet
+   */
+  public applyComplianceSuggestion(issue: ComplianceIssue): string | undefined {
+    const editor = this.quillEditorComponent()?.quillEditor;
+    if (!editor) return undefined;
+
+    const targetSnippet = issue.text?.trim() ?? '';
+    const replacement = issue.suggestion?.trim() ?? '';
+    const originalText = editor.getText();
+    const targetIndex = targetSnippet ? originalText.toLowerCase().indexOf(targetSnippet.toLowerCase()) : -1;
+
+    switch (issue.action) {
+      case ComplianceIssueActionEnum.Replace: {
+        if (targetIndex === -1) return undefined;
+        editor.deleteText(targetIndex, targetSnippet.length);
+        editor.insertText(targetIndex, replacement);
+        return editor.root.innerHTML;
+      }
+      case ComplianceIssueActionEnum.Remove: {
+        if (targetIndex === -1) return undefined;
+        editor.deleteText(targetIndex, targetSnippet.length);
+        return editor.root.innerHTML;
+      }
+      case ComplianceIssueActionEnum.Add: {
+        const insertAt = targetIndex === -1 ? editor.getLength() : findSentenceEnd(originalText, targetIndex + targetSnippet.length);
+        const separator = targetIndex === -1 ? '\n' : ' ';
+        editor.insertText(insertAt, separator + replacement);
+        return editor.root.innerHTML;
+      }
+      default:
+        return undefined;
+    }
+  }
+
   /**
    * Sends the text and position of a highlighted item
    * when the mouse hovers over it, so a popover can be shown.
diff --git a/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.html b/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.html
index 0d9993382d..575c5f55ca 100644
--- a/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.html
+++ b/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.html
@@ -1,10 +1,12 @@
 @if (issue()) {
-  <div
-    class="fixed z-50 w-72 rounded-md bg-background-default shadow-lg p-3 text-sm pointer-events-none text-xs"
-    [style.left.px]="x()"
-    [style.top.px]="y()"
-  >
-    <p class="m-0 font-semibold mb-1 text-text-tertiary">{{ issue()?.article }}</p>
-    <p class="m-0 text-text-secondary leading-relaxed">{{ issue()?.explanation }}</p>
+  <div class="fixed z-50 w-72" [style.left.px]="x()" [style.top.px]="y()" (mouseleave)="closed.emit()">
+    <jhi-suggestion-system
+      [article]="issue()?.article"
+      [suggestion]="issue()?.suggestion"
+      [explanation]="issue()?.explanation"
+      [actionLabel]="actionButtonLabel()"
+      (accepted)="onAccept()"
+      (dismissed)="onDismiss()"
+    />
   </div>
 }
diff --git a/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.ts b/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.ts
index c9092a3378..fbe5f9540b 100644
--- a/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.ts
+++ b/src/main/webapp/app/shared/components/molecules/ai-compliance-popover/ai-compliance-popover.component.ts
@@ -1,11 +1,12 @@
 import { CommonModule } from '@angular/common';
-import { Component, input } from '@angular/core';
-import { ComplianceIssue } from 'app/generated/model/compliance-issue';
+import { Component, computed, input, output } from '@angular/core';
+import { ComplianceIssue, ComplianceIssueActionEnum } from 'app/generated/model/compliance-issue';
+import { SuggestionSystemComponent } from 'app/shared/components/molecules/suggestion-system/suggestion-system.component';
 
 @Component({
   selector: 'jhi-compliance-popover',
   standalone: true,
-  imports: [CommonModule],
+  imports: [CommonModule, SuggestionSystemComponent],
   templateUrl: './ai-compliance-popover.component.html',
 })
 export class CompliancePopoverComponent {
@@ -16,4 +17,31 @@ export class CompliancePopoverComponent {
 
   /** Viewport Y coordinate. Positions the popover just below the highlighted span. */
   y = input<number>(0);
+
+  readonly accept = output<ComplianceIssue>();
+  readonly dismiss = output<ComplianceIssue>();
+  readonly closed = output();
+
+  readonly actionButtonLabel = computed(() => {
+    switch (this.issue()?.action) {
+      case ComplianceIssueActionEnum.Replace:
+        return 'jobCreationForm.positionDetailsSection.jobDescription.popover.replaceButton';
+      case ComplianceIssueActionEnum.Add:
+        return 'jobCreationForm.positionDetailsSection.jobDescription.popover.addButton';
+      case ComplianceIssueActionEnum.Remove:
+        return 'jobCreationForm.positionDetailsSection.jobDescription.popover.removeButton';
+      default:
+        return 'jobCreationForm.positionDetailsSection.jobDescription.popover.applyButton';
+    }
+  });
+
+  onAccept(): void {
+    const issue = this.issue();
+    if (issue) this.accept.emit(issue);
+  }
+
+  onDismiss(): void {
+    const issue = this.issue();
+    if (issue) this.dismiss.emit(issue);
+  }
 }
diff --git a/src/main/webapp/app/shared/components/molecules/sticky-footer-shell/sticky-footer-shell.component.html b/src/main/webapp/app/shared/components/molecules/sticky-footer-shell/sticky-footer-shell.component.html
index 5993c85cf5..8a66b7a5fa 100644
--- a/src/main/webapp/app/shared/components/molecules/sticky-footer-shell/sticky-footer-shell.component.html
+++ b/src/main/webapp/app/shared/components/molecules/sticky-footer-shell/sticky-footer-shell.component.html
@@ -1,5 +1,5 @@
 <div
-  class="sticky bottom-0 mt-auto py-2 sm:py-3 bg-background-default transition-all duration-300 z-[1000] ease-in-out -mx-4 px-4 lg:-mx-12 lg:px-12 border-t"
+  class="sticky bottom-0 mt-auto py-2 sm:py-3 bg-background-default transition-all duration-300 z-40 ease-in-out -mx-4 px-4 lg:-mx-12 lg:px-12 border-t"
   [class.border-border-default]="!isAtBottom()"
   [class.border-transparent]="isAtBottom()"
 >
diff --git a/src/main/webapp/app/shared/components/molecules/suggestion-system/suggestion-system.component.html b/src/main/webapp/app/shared/components/molecules/suggestion-system/suggestion-system.component.html
new file mode 100644
index 0000000000..3fdd03231e
--- /dev/null
+++ b/src/main/webapp/app/shared/components/molecules/suggestion-system/suggestion-system.component.html
@@ -0,0 +1,46 @@
+<div class="rounded-md bg-background-default p-3 text-xs text-text-primary shadow-lg">
+  <div class="space-y-2.5">
+    @if (article()) {
+      <p class="m-0 text-[0.69rem] font-semibold text-text-tertiary">{{ article() }}</p>
+    }
+
+    @if (suggestion()) {
+      <p
+        class="-mx-2 -my-1 mt-0.5 rounded px-2 py-1 text-xs leading-relaxed tracking-wide text-text-primary transition-colors"
+        [class.bg-background-surface]="isActionHovered()"
+        [class.text-primary-default]="isActionHovered()"
+      >
+        {{ suggestion() }}
+      </p>
+    }
+
+    @if (explanation()) {
+      <p class="m-0 text-xs leading-relaxed text-text-secondary">{{ explanation() }}</p>
+    }
+
+    <div class="flex justify-end gap-1 pt-0.5">
+      <jhi-button
+        label="jobCreationForm.positionDetailsSection.jobDescription.popover.dismissButton"
+        severity="secondary"
+        variant="text"
+        size="xs"
+        classStyling="!h-auto !min-w-0 !border-transparent !bg-transparent !px-2 !py-1.5 !text-[0.69rem] !font-medium !leading-none !text-text-tertiary !shadow-none hover:!border-transparent hover:!bg-background-surface focus:!shadow-none"
+        [shouldTranslate]="true"
+        (click)="dismissed.emit()"
+      />
+      <jhi-button
+        [label]="actionLabel()"
+        severity="primary"
+        variant="text"
+        size="xs"
+        classStyling="!h-auto !min-w-0 !border-transparent !bg-transparent !px-2 !py-1.5 !text-[0.69rem] !font-medium !leading-none !text-text-primary !shadow-none hover:!border-transparent hover:!bg-background-surface focus:!shadow-none"
+        [shouldTranslate]="true"
+        (mouseenter)="isActionHovered.set(true)"
+        (mouseleave)="isActionHovered.set(false)"
+        (focusin)="isActionHovered.set(true)"
+        (focusout)="isActionHovered.set(false)"
+        (click)="accepted.emit()"
+      />
+    </div>
+  </div>
+</div>
diff --git a/src/main/webapp/app/shared/components/molecules/suggestion-system/suggestion-system.component.ts b/src/main/webapp/app/shared/components/molecules/suggestion-system/suggestion-system.component.ts
new file mode 100644
index 0000000000..c86bf7cd10
--- /dev/null
+++ b/src/main/webapp/app/shared/components/molecules/suggestion-system/suggestion-system.component.ts
@@ -0,0 +1,20 @@
+import { Component, input, output, signal } from '@angular/core';
+import { ButtonComponent } from 'app/shared/components/atoms/button/button.component';
+
+@Component({
+  selector: 'jhi-suggestion-system',
+  standalone: true,
+  imports: [ButtonComponent],
+  templateUrl: './suggestion-system.component.html',
+})
+export class SuggestionSystemComponent {
+  article = input<string | undefined>(undefined);
+  suggestion = input<string | undefined>(undefined);
+  explanation = input<string | undefined>(undefined);
+  actionLabel = input<string>('jobCreationForm.positionDetailsSection.jobDescription.popover.applyButton');
+
+  accepted = output();
+  dismissed = output();
+
+  readonly isActionHovered = signal(false);
+}
diff --git a/src/main/webapp/app/shared/util/compliance-suggestion.util.ts b/src/main/webapp/app/shared/util/compliance-suggestion.util.ts
new file mode 100644
index 0000000000..a66ebf614c
--- /dev/null
+++ b/src/main/webapp/app/shared/util/compliance-suggestion.util.ts
@@ -0,0 +1,60 @@
+import { ComplianceIssue, ComplianceIssueActionEnum } from 'app/generated/model/compliance-issue';
+
+/** Returns the end of the sentence containing a compliance snippet. */
+export function findSentenceEnd(text: string, snippetEnd: number): number {
+  if (/[.!?]["'’”\])}]*$/.test(text.slice(0, snippetEnd))) return snippetEnd;
+  const match = /[.!?](?=\s|$)/.exec(text.slice(snippetEnd));
+  return match ? snippetEnd + match.index + 1 : snippetEnd;
+}
+
+/** Applies an issue to stored editor HTML without switching language tabs. */
+export function applyComplianceSuggestionToHtml(html: string, issue: ComplianceIssue): string | undefined {
+  const target = issue.text?.trim() ?? '';
+  const suggestion = issue.suggestion?.trim() ?? '';
+  if (!target) return undefined;
+
+  const container = document.createElement('div');
+  container.innerHTML = html;
+  const walker = document.createTreeWalker(container, NodeFilter.SHOW_TEXT);
+  const nodes: Text[] = [];
+  let current = walker.nextNode();
+  while (current) {
+    nodes.push(current as Text);
+    current = walker.nextNode();
+  }
+
+  const fullText = nodes.map(node => node.data).join('');
+  const start = fullText.toLowerCase().indexOf(target.toLowerCase());
+  if (start === -1) return undefined;
+
+  const locate = (offset: number, preferNextAtBoundary = false): { node: Text; offset: number } | undefined => {
+    let consumed = 0;
+    for (const node of nodes) {
+      const nodeEnd = consumed + node.length;
+      if (offset < nodeEnd || (!preferNextAtBoundary && offset === nodeEnd)) return { node, offset: offset - consumed };
+      consumed += node.length;
+    }
+    return undefined;
+  };
+
+  const targetEnd = start + target.length;
+  const end = issue.action === ComplianceIssueActionEnum.Add ? findSentenceEnd(fullText, targetEnd) : targetEnd;
+  const from = locate(start, true);
+  const to = locate(end);
+  if (!from || !to) return undefined;
+
+  if (issue.action === ComplianceIssueActionEnum.Add) {
+    to.node.insertData(to.offset, ` ${suggestion}`);
+  } else if (from.node === to.node) {
+    from.node.replaceData(from.offset, to.offset - from.offset, issue.action === ComplianceIssueActionEnum.Remove ? '' : suggestion);
+  } else {
+    const range = document.createRange();
+    range.setStart(from.node, from.offset);
+    range.setEnd(to.node, to.offset);
+    range.deleteContents();
+    if (issue.action !== ComplianceIssueActionEnum.Remove) {
+      range.insertNode(document.createTextNode(suggestion));
+    }
+  }
+  return container.innerHTML;
+}
diff --git a/src/main/webapp/i18n/de/job.json b/src/main/webapp/i18n/de/job.json
index 22f979e409..5075c5e117 100644
--- a/src/main/webapp/i18n/de/job.json
+++ b/src/main/webapp/i18n/de/job.json
@@ -245,6 +245,13 @@
           "warning": "Deine Ausschreibung könnte inklusiver sein. Stellenanzeigen mit höherem Score sprechen vielfältigere Bewerbende an und erhalten mehr Rückmeldungen.",
           "good": "Das ist schon eine gute Grundlage. Deine Ausschreibung ist bereits inklusiv und spricht viele Bewerbende an. Mit gezielten Verfeinerungen kannst du sie noch stärker machen.",
           "excellent": "Eine wirklich gelungene und einladende Ausschreibung! Deine Ausschreibung ist sehr einladend formuliert und spricht eine breite Vielfalt an Bewerbenden an."
+        },
+        "popover": {
+          "dismissButton": "Verwerfe",
+          "replaceButton": "Ersetze",
+          "addButton": "Hinzufügen",
+          "removeButton": "Lösche",
+          "applyButton": "Anwenden"
         }
       }
     },
diff --git a/src/main/webapp/i18n/en/job.json b/src/main/webapp/i18n/en/job.json
index 8830e3e23c..923e9525ea 100644
--- a/src/main/webapp/i18n/en/job.json
+++ b/src/main/webapp/i18n/en/job.json
@@ -245,6 +245,13 @@
           "warning": "Your job could be more inclusive. Job descriptions with a higher score attract more diverse applicants and get more responses.",
           "good": "This is already a solid foundation. Your posting is inclusive and reaches many candidates. With a few targeted refinements, it can perform even better.",
           "excellent": "A very well-written and inviting job posting! Your posting is very welcoming and appeals to a broad and diverse range of applicants."
+        },
+        "popover": {
+          "dismissButton": "Dismiss",
+          "replaceButton": "Replace",
+          "addButton": "Add",
+          "removeButton": "Remove",
+          "applyButton": "Apply"
         }
       }
     },
diff --git a/src/test/java/de/tum/cit/aet/ai/service/AiServiceTest.java b/src/test/java/de/tum/cit/aet/ai/service/AiServiceTest.java
new file mode 100644
index 0000000000..50d5ab41fd
--- /dev/null
+++ b/src/test/java/de/tum/cit/aet/ai/service/AiServiceTest.java
@@ -0,0 +1,554 @@
+package de.tum.cit.aet.ai.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.tuple;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import de.tum.cit.aet.ai.constants.ComplianceAction;
+import de.tum.cit.aet.ai.constants.ComplianceCategory;
+import de.tum.cit.aet.ai.domain.ComplianceIssue;
+import de.tum.cit.aet.ai.dto.MapComplianceIssuesRequestDTO;
+import de.tum.cit.aet.application.service.ApplicationService;
+import de.tum.cit.aet.core.documents.service.DocumentService;
+import de.tum.cit.aet.core.dto.GenderBiasAnalysisResponse;
+import de.tum.cit.aet.core.exception.InternalServerException;
+import de.tum.cit.aet.core.service.CurrentUserService;
+import de.tum.cit.aet.core.service.GenderBiasAnalysisService;
+import de.tum.cit.aet.job.constants.Campus;
+import de.tum.cit.aet.job.constants.JobState;
+import de.tum.cit.aet.job.constants.RecommendationType;
+import de.tum.cit.aet.job.constants.SubjectArea;
+import de.tum.cit.aet.job.dto.JobFormDTO;
+import de.tum.cit.aet.job.service.JobService;
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Consumer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.core.ParameterizedTypeReference;
+
+class AiServiceTest {
+
+    private static final UUID JOB_ID = UUID.fromString("00000000-0000-0000-0000-000000000444");
+    private static final String LANG_DE = "de";
+    private static final String LANG_EN = "en";
+    private static final String USER_LANG = "en";
+
+    private JobService jobService;
+    private AiFeatureToggleService aiFeatureToggleService;
+    private GenderBiasAnalysisService genderBiasAnalysisService;
+    private ComplianceScoreService complianceScoreService;
+    private ChatClient chatClient;
+
+    private AiService aiService;
+
+    @BeforeEach
+    void setUp() {
+        ChatClient.Builder chatClientBuilder = mock(ChatClient.Builder.class);
+        chatClient = mock(ChatClient.class, RETURNS_DEEP_STUBS);
+        when(chatClientBuilder.build()).thenReturn(chatClient);
+
+        jobService = mock(JobService.class);
+        ApplicationService applicationService = mock(ApplicationService.class);
+        DocumentService documentService = mock(DocumentService.class);
+        CurrentUserService currentUserService = mock(CurrentUserService.class);
+        genderBiasAnalysisService = mock(GenderBiasAnalysisService.class);
+        complianceScoreService = mock(ComplianceScoreService.class);
+        aiFeatureToggleService = mock(AiFeatureToggleService.class);
+        AiUsageEventService aiUsageEventService = mock(AiUsageEventService.class);
+
+        aiService = new AiService(
+            chatClientBuilder,
+            jobService,
+            applicationService,
+            documentService,
+            currentUserService,
+            genderBiasAnalysisService,
+            complianceScoreService,
+            aiFeatureToggleService,
+            aiUsageEventService
+        );
+    }
+
+    // ===== ANALYZE JOB DESCRIPTION =====
+    @Nested
+    class AnalyzeJobDescriptionTests {
+
+        @Test
+        void shouldRunComplianceAnalysisAndPersistScoreWhenAiIsAvailable() {
+            // Arrange
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+            List<ComplianceIssue> aiIssues = List.of(createComplianceIssue("issue text", LANG_EN));
+
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(aiIssues);
+            when(complianceScoreService.calculateGenderScore(analysis, null)).thenReturn(80);
+            when(complianceScoreService.calculateLegalScore(any())).thenReturn(100);
+
+            // Act
+            List<ComplianceIssue> result = aiService.analyzeJobDescription(
+                "Job Title",
+                JOB_ID,
+                "description text",
+                LANG_EN,
+                USER_LANG,
+                analysis,
+                null
+            );
+
+            assertThat(result)
+                .hasSize(1)
+                .first()
+                .satisfies(issue -> assertThat(issue.getLanguage()).isEqualTo(LANG_EN));
+
+            // Verify: combinedScore = sqrt(80 * 100) = sqrt(8000) ≈ 89
+            verify(jobService).updateAiAnalysis(eq(JOB_ID), eq(89), eq(aiIssues), eq(LANG_EN));
+            verify(aiFeatureToggleService).recordSuccess();
+            verify(aiFeatureToggleService, never()).recordFailure();
+        }
+
+        @Test
+        void shouldSkipLlmAnalysisAndUseGenderScoreOnlyWhenAiUnavailable() {
+            // Arrange
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(false);
+            when(complianceScoreService.calculateGenderScore(analysis, null)).thenReturn(75);
+            when(complianceScoreService.calculateLegalScore(List.of())).thenReturn(100);
+
+            List<ComplianceIssue> result = aiService.analyzeJobDescription(
+                "Job Title",
+                JOB_ID,
+                "description text",
+                LANG_EN,
+                USER_LANG,
+                analysis,
+                null
+            );
+
+            assertThat(result).isEmpty();
+
+            // combinedScore = sqrt(75 * 100) ≈ 87
+            verify(jobService).updateAiAnalysis(eq(JOB_ID), eq(87), eq(List.of()), eq(LANG_EN));
+            verify(chatClient, never()).prompt();
+            verify(aiFeatureToggleService, never()).recordSuccess();
+        }
+
+        @Test
+        void shouldThrowInternalServerExceptionAndRecordFailureWhenLlmCallFails() {
+            // Arrange
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenThrow(
+                new RuntimeException("LLM error")
+            );
+
+            assertThatThrownBy(() ->
+                aiService.analyzeJobDescription("Job Title", JOB_ID, "description text", LANG_EN, USER_LANG, analysis, null)
+            )
+                .isInstanceOf(InternalServerException.class)
+                .hasMessageContaining("Compliance analysis parsing failed");
+
+            verify(aiFeatureToggleService).recordFailure();
+            verify(jobService, never()).updateAiAnalysis(any(UUID.class), anyInt(), anyList(), anyString());
+        }
+
+        @Test
+        void shouldHandleNullTitleGracefully() {
+            // Arrange
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(List.of());
+            when(complianceScoreService.calculateGenderScore(any(), any())).thenReturn(100);
+            when(complianceScoreService.calculateLegalScore(any())).thenReturn(100);
+
+            // Act
+            List<ComplianceIssue> result = aiService.analyzeJobDescription(null, JOB_ID, "description", LANG_EN, USER_LANG, analysis, null);
+
+            assertThat(result).isEmpty();
+            verify(jobService).updateAiAnalysis(eq(JOB_ID), eq(100), eq(List.of()), eq(LANG_EN));
+        }
+
+        @Test
+        void shouldCombineGenderAndLegalScoreUsingGeometricMean() {
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(List.of());
+            when(complianceScoreService.calculateGenderScore(any(), any())).thenReturn(64);
+            when(complianceScoreService.calculateLegalScore(any())).thenReturn(36);
+
+            // Act
+            aiService.analyzeJobDescription("Title", JOB_ID, "text", LANG_EN, USER_LANG, analysis, null);
+
+            // Assert: geometric mean of 64 and 36 = sqrt(64*36) = sqrt(2304) = 48
+            verify(jobService).updateAiAnalysis(eq(JOB_ID), eq(48), eq(List.of()), eq(LANG_EN));
+        }
+    }
+
+    // ===== ANALYZE CURRENT JOB DESCRIPTION =====
+    @Nested
+    class AnalyzeCurrentJobDescriptionTests {
+
+        @Test
+        void shouldUseGermanDescriptionWhenLanguageIsDe() {
+            JobFormDTO jobFormDTO = createJobFormDTO("Title", "<p>English text</p>", "<p>Deutscher Text</p>");
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+            when(genderBiasAnalysisService.analyzeText(eq("Deutscher Text"), eq(LANG_DE))).thenReturn(analysis);
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(false);
+            when(complianceScoreService.calculateGenderScore(any(), any())).thenReturn(80);
+            when(complianceScoreService.calculateLegalScore(any())).thenReturn(100);
+
+            aiService.analyzeCurrentJobDescription(jobFormDTO, LANG_DE, USER_LANG);
+
+            // Assert: gender service called with HTML-stripped German text
+            verify(genderBiasAnalysisService).analyzeText(eq("Deutscher Text"), eq(LANG_DE));
+        }
+
+        @Test
+        void shouldUseEnglishDescriptionWhenLanguageIsEn() {
+            // Arrange
+            JobFormDTO jobFormDTO = createJobFormDTO("Title", "<p>English text</p>", "<p>Deutscher Text</p>");
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+            when(genderBiasAnalysisService.analyzeText(eq("English text"), eq(LANG_EN))).thenReturn(analysis);
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(false);
+            when(complianceScoreService.calculateGenderScore(any(), any())).thenReturn(80);
+            when(complianceScoreService.calculateLegalScore(any())).thenReturn(100);
+
+            aiService.analyzeCurrentJobDescription(jobFormDTO, LANG_EN, USER_LANG);
+
+            // Assert: gender service called with HTML-stripped English text
+            verify(genderBiasAnalysisService).analyzeText(eq("English text"), eq(LANG_EN));
+        }
+
+        @Test
+        void shouldHandleNullDescriptionGracefully() {
+            JobFormDTO jobFormDTO = createJobFormDTO("Title", null, null);
+            GenderBiasAnalysisResponse analysis = mock(GenderBiasAnalysisResponse.class);
+            when(genderBiasAnalysisService.analyzeText(eq(""), eq(LANG_EN))).thenReturn(analysis);
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(false);
+            when(complianceScoreService.calculateGenderScore(any(), any())).thenReturn(100);
+            when(complianceScoreService.calculateLegalScore(any())).thenReturn(100);
+
+            aiService.analyzeCurrentJobDescription(jobFormDTO, LANG_EN, USER_LANG);
+
+            verify(genderBiasAnalysisService).analyzeText(eq(""), eq(LANG_EN));
+        }
+    }
+
+    // ===== MAP COMPLIANCE ISSUES =====
+    @Nested
+    class MapComplianceIssuesTests {
+
+        @Test
+        void shouldReturnEmptyAndClearTargetIssuesWhenSourceIssuesEmpty() {
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                List.of()
+            );
+
+            // Act
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            assertThat(result).isEmpty();
+            verify(jobService).updateComplianceIssues(JOB_ID, List.of(), LANG_DE);
+            verifyNoMoreInteractions(jobService);
+            verify(chatClient, never()).prompt();
+        }
+
+        @Test
+        void shouldReturnEmptyWhenComplianceIssuesIsNull() {
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                null
+            );
+
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            assertThat(result).isEmpty();
+            verifyNoInteractions(jobService);
+            verify(chatClient, never()).prompt();
+        }
+
+        @Test
+        void shouldReturnEmptyWhenTranslatedTextMissing() {
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                " ",
+                List.of(createComplianceIssue("source text", LANG_EN))
+            );
+
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            assertThat(result).isEmpty();
+            verify(jobService, never()).updateComplianceIssues(any(UUID.class), any(), anyString());
+            verify(chatClient, never()).prompt();
+        }
+
+        @Test
+        void shouldReturnEmptyWhenTranslatedTextIsNull() {
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                null,
+                List.of(createComplianceIssue("source text", LANG_EN))
+            );
+
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            assertThat(result).isEmpty();
+            verify(jobService, never()).updateComplianceIssues(any(UUID.class), any(), anyString());
+        }
+
+        @Test
+        void shouldReturnEmptyWhenAiUnavailable() {
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(false);
+
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                List.of(createComplianceIssue("source text", LANG_EN))
+            );
+
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            assertThat(result).isEmpty();
+            verify(chatClient, never()).prompt();
+            verify(jobService, never()).updateComplianceIssues(any(UUID.class), any(), anyString());
+        }
+
+        @Test
+        void shouldMapIssuesAndPersistWhenAiIsAvailable() {
+            List<String> mappedTexts = List.of("Gemappter Text", "Sichere Formulierung");
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(
+                mappedTexts
+            );
+
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                List.of(createComplianceIssue("source text", LANG_EN))
+            );
+
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            assertThat(result)
+                .hasSize(1)
+                .extracting(ComplianceIssue::getText, ComplianceIssue::getSuggestion, ComplianceIssue::getLanguage)
+                .containsExactly(tuple("Gemappter Text", "Sichere Formulierung", LANG_DE));
+
+            verify(jobService).updateComplianceIssues(eq(JOB_ID), eq(result), eq(LANG_DE));
+            verify(aiFeatureToggleService).recordSuccess();
+        }
+
+        @Test
+        void shouldIgnoreBlankSnippetsWithoutDiscardingValidMappings() {
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(
+                List.of("jungen, dynamischen", "erfahrenen, vielfältigen")
+            );
+            ComplianceIssue validIssue = createComplianceIssue("young, dynamic", LANG_EN);
+            ComplianceIssue blankIssue = createComplianceIssue("", LANG_EN);
+
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "young, dynamic candidate",
+                "jungen, dynamischen Kandidaten",
+                List.of(validIssue, blankIssue)
+            );
+
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            assertThat(result)
+                .hasSize(1)
+                .extracting(ComplianceIssue::getText, ComplianceIssue::getLanguage)
+                .containsExactly(tuple("jungen, dynamischen", LANG_DE));
+            verify(jobService).updateComplianceIssues(JOB_ID, result, LANG_DE);
+        }
+
+        @Test
+        void shouldPreserveOriginalMetadataWhenMapping() {
+            ComplianceIssue source = createComplianceIssue("source text", LANG_EN);
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(
+                List.of("Gemappter Text", "Sichere Formulierung")
+            );
+
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                List.of(source)
+            );
+
+            List<ComplianceIssue> result = aiService.mapComplianceIssues(request);
+
+            // Assert: category, article, explanation, action preserved
+            assertThat(result)
+                .hasSize(1)
+                .first()
+                .satisfies(mapped -> {
+                    assertThat(mapped.getCategory()).isEqualTo(source.getCategory());
+                    assertThat(mapped.getArticle()).isEqualTo(source.getArticle());
+                    assertThat(mapped.getExplanation()).isEqualTo(source.getExplanation());
+                    assertThat(mapped.getAction()).isEqualTo(source.getAction());
+                    assertThat(mapped.getText()).isEqualTo("Gemappter Text");
+                    assertThat(mapped.getSuggestion()).isEqualTo("Sichere Formulierung");
+                    assertThat(mapped.getLanguage()).isEqualTo(LANG_DE);
+                });
+        }
+
+        @Test
+        void shouldThrowExceptionAndRecordFailureWhenLlmCallFails() {
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenThrow(
+                new RuntimeException("LLM error")
+            );
+
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                List.of(createComplianceIssue("source text", LANG_EN))
+            );
+
+            assertThatThrownBy(() -> aiService.mapComplianceIssues(request))
+                .isInstanceOf(InternalServerException.class)
+                .hasMessageContaining("Compliance issue mapping failed");
+
+            verify(aiFeatureToggleService).recordFailure();
+            verify(jobService, never()).updateComplianceIssues(any(UUID.class), any(), anyString());
+        }
+
+        @Test
+        void shouldThrowExceptionWhenMappingReturnsWrongNumberOfSnippets() {
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            // Source has 2 issues but LLM returns only 1 mapped text
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(
+                List.of("Nur ein Text")
+            );
+
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                List.of(createComplianceIssue("source 1", LANG_EN), createComplianceIssue("source 2", LANG_EN))
+            );
+            assertThatThrownBy(() -> aiService.mapComplianceIssues(request))
+                .isInstanceOf(InternalServerException.class)
+                .hasMessageContaining("invalid number of snippets");
+
+            verify(aiFeatureToggleService).recordFailure();
+            verify(jobService, never()).updateComplianceIssues(any(UUID.class), any(), anyString());
+        }
+
+        @Test
+        void shouldThrowExceptionWhenMappingReturnsNull() {
+            when(aiFeatureToggleService.isAiAvailable()).thenReturn(true);
+            when(chatClient.prompt().user(any(Consumer.class)).call().entity(any(ParameterizedTypeReference.class))).thenReturn(null);
+
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                LANG_DE,
+                JOB_ID,
+                "source text",
+                "translated text",
+                List.of(createComplianceIssue("source text", LANG_EN))
+            );
+
+            assertThatThrownBy(() -> aiService.mapComplianceIssues(request))
+                .isInstanceOf(InternalServerException.class)
+                .hasMessageContaining("invalid number of snippets");
+
+            verify(aiFeatureToggleService).recordFailure();
+        }
+    }
+
+    // ===== HELPER METHODS =====
+
+    /**
+     * Creates a ComplianceIssue with default test values.
+     *
+     * @param text     the snippet text identifying the issue location in the description
+     * @param language the language code ("de" or "en") tagged onto the issue
+     * @return a new ComplianceIssue with CRITICAL_AGG category and REPLACE action
+     */
+    private ComplianceIssue createComplianceIssue(String text, String language) {
+        return new ComplianceIssue(
+            "1",
+            ComplianceCategory.CRITICAL_AGG,
+            text,
+            "§ 1 AGG",
+            "Discriminatory sentence",
+            ComplianceAction.REPLACE,
+            "safe wording",
+            language
+        );
+    }
+
+    /**
+     * Creates a JobFormDTO for testing.
+     *
+     * @param title         the job title
+     * @param descriptionEN the English job description (HTML allowed, may be null)
+     * @param descriptionDE the German job description (HTML allowed, may be null)
+     * @return a JobFormDTO with the given fields set and other fields holding default test values
+     */
+    private JobFormDTO createJobFormDTO(String title, String descriptionEN, String descriptionDE) {
+        return new JobFormDTO(
+            JOB_ID,
+            title,
+            "AI",
+            SubjectArea.COMPUTER_SCIENCE,
+            null,
+            Campus.MUNICH,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            0,
+            (RecommendationType) null,
+            descriptionEN,
+            descriptionDE,
+            JobState.DRAFT,
+            null,
+            true,
+            false,
+            null,
+            null
+        );
+    }
+}
diff --git a/src/test/java/de/tum/cit/aet/ai/service/ComplianceScoreServiceTest.java b/src/test/java/de/tum/cit/aet/ai/service/ComplianceScoreServiceTest.java
index dc1c4944d9..4a01ebc8c5 100644
--- a/src/test/java/de/tum/cit/aet/ai/service/ComplianceScoreServiceTest.java
+++ b/src/test/java/de/tum/cit/aet/ai/service/ComplianceScoreServiceTest.java
@@ -42,6 +42,7 @@ void shouldReturnZeroLegalScoreWhenCriticalAggIssueExists() {
                     "§ 1 AGG",
                     "Discriminatory sentence",
                     ComplianceAction.REPLACE,
+                    null,
                     "en"
                 )
             );
@@ -61,6 +62,7 @@ void shouldApplyTransparencyPenaltyWhenOnlyTransparencyIssuesExist() {
                     "Art. 13 DSGVO",
                     "Missing disclosure",
                     ComplianceAction.ADD,
+                    null,
                     "en"
                 ),
                 new ComplianceIssue(
@@ -70,6 +72,7 @@ void shouldApplyTransparencyPenaltyWhenOnlyTransparencyIssuesExist() {
                     "Art. 13 DSGVO",
                     "Missing disclosure",
                     ComplianceAction.ADD,
+                    null,
                     "en"
                 )
             );
diff --git a/src/test/java/de/tum/cit/aet/ai/web/rest/AiResourceTest.java b/src/test/java/de/tum/cit/aet/ai/web/rest/AiResourceTest.java
index 29a16e9de4..e38f5c28fd 100644
--- a/src/test/java/de/tum/cit/aet/ai/web/rest/AiResourceTest.java
+++ b/src/test/java/de/tum/cit/aet/ai/web/rest/AiResourceTest.java
@@ -9,6 +9,7 @@
 import de.tum.cit.aet.ai.constants.ComplianceAction;
 import de.tum.cit.aet.ai.constants.ComplianceCategory;
 import de.tum.cit.aet.ai.domain.ComplianceIssue;
+import de.tum.cit.aet.ai.dto.MapComplianceIssuesRequestDTO;
 import de.tum.cit.aet.ai.dto.TranslateComplianceDTO;
 import de.tum.cit.aet.ai.service.AiFeatureToggleService;
 import de.tum.cit.aet.ai.service.AiService;
@@ -51,6 +52,7 @@ class AiResourceTest extends AbstractResourceTest {
 
     private final String TRANSLATE_STREAM_URL = "/api/ai/translateJobDescriptionStream";
     private final String ANALYZE_URL = "/api/ai/analyze-job-description";
+    private final String MAP_COMPLIANCE_URL = "/api/ai/map-compliance-issues";
 
     private final String input = "Hello World";
 
@@ -96,6 +98,48 @@ void shouldReturnUnauthorizedWhenTranslateJobDescriptionWithoutAuthentication()
         }
     }
 
+    // ===== MAP COMPLIANCE ISSUES =====
+    @Nested
+    class MapComplianceIssuesTests {
+
+        @Test
+        void shouldReturnMappedComplianceIssuesWhenProfessorMapsComplianceIssues() {
+            List<ComplianceIssue> sourceIssues = List.of(createComplianceIssue("I don't allow disabled applicants", "en"));
+            List<ComplianceIssue> mappedIssues = List.of(createComplianceIssue("Ich erlaube keine Bewerber mit Behinderung", "de"));
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                "de",
+                JOB_ID,
+                "I don't allow disabled applicants",
+                "Ich erlaube keine Bewerber mit Behinderung",
+                sourceIssues
+            );
+
+            given(aiService.mapComplianceIssues(any(MapComplianceIssuesRequestDTO.class))).willReturn(mappedIssues);
+
+            List<ComplianceIssue> response = api
+                .with(JwtPostProcessors.jwtUser(PROFESSOR_USER_ID, "ROLE_PROFESSOR"))
+                .postAndRead(MAP_COMPLIANCE_URL, request, new TypeReference<List<ComplianceIssue>>() {}, 200);
+
+            assertThat(response).hasSize(1);
+            assertThat(response.getFirst().getText()).isEqualTo("Ich erlaube keine Bewerber mit Behinderung");
+        }
+
+        @Test
+        void shouldReturnBadRequestWhenMappingRequestIsMissingTranslatedText() {
+            MapComplianceIssuesRequestDTO request = new MapComplianceIssuesRequestDTO(
+                "de",
+                JOB_ID,
+                "I don't allow disabled applicants",
+                null,
+                List.of()
+            );
+
+            api
+                .with(JwtPostProcessors.jwtUser(PROFESSOR_USER_ID, "ROLE_PROFESSOR"))
+                .postAndRead(MAP_COMPLIANCE_URL, request, Void.class, 400);
+        }
+    }
+
     // ===== ANALYZE JOB DESCRIPTION =====
     @Nested
     class AnalyzeJobDescriptionTests {
@@ -110,6 +154,7 @@ void shouldReturnComplianceIssuesWhenProfessorAnalyzesJobDescription() {
                     "§ 1 AGG",
                     "Discriminatory sentence",
                     ComplianceAction.REPLACE,
+                    null,
                     "en"
                 )
             );
@@ -137,6 +182,19 @@ void shouldReturnUnauthorizedWhenAnalyzeJobDescriptionWithoutAuthentication() {
         }
     }
 
+    private ComplianceIssue createComplianceIssue(String text, String language) {
+        return new ComplianceIssue(
+            "1",
+            ComplianceCategory.CRITICAL_AGG,
+            text,
+            "§ 1 AGG",
+            "Discriminatory sentence",
+            ComplianceAction.REPLACE,
+            "safe wording",
+            language
+        );
+    }
+
     private JobFormDTO createValidJobForm() {
         return new JobFormDTO(
             JOB_ID,
diff --git a/src/test/webapp/app/job/job-creation-form/job-creation-form.component.spec.ts b/src/test/webapp/app/job/job-creation-form/job-creation-form.component.spec.ts
index 42c6e32517..0864f12817 100644
--- a/src/test/webapp/app/job/job-creation-form/job-creation-form.component.spec.ts
+++ b/src/test/webapp/app/job/job-creation-form/job-creation-form.component.spec.ts
@@ -19,6 +19,8 @@ import { UserShortDTORolesEnum } from 'app/generated/model/user-short-dto';
 import { ImageDTOImageTypeEnum } from 'app/generated/model/image-dto';
 import { JobDTO } from 'app/generated/model/job-dto';
 import { ImageDTO } from 'app/generated/model/image-dto';
+import { ComplianceIssue, ComplianceIssueActionEnum } from 'app/generated/model/compliance-issue';
+import { AiResourceApi } from 'app/generated/api/ai-resource-api';
 import { RecommendationType } from 'app/generated/model/recommendation-type';
 import * as DropdownOptions from 'app/job/dropdown-options';
 import { unescapeJsonString } from 'app/shared/util/util';
@@ -95,8 +97,13 @@ type ComponentPrivate = {
   extractJobDescriptionFromStream: (content: string) => string | null;
   loadSupervisingProfessors: () => Promise<void>;
   setDefaultSupervisingProfessor: (preselectId?: string) => void;
-  translateAndStoreOtherLanguage: (currentLang: 'en' | 'de', currentText: string) => Promise<void>;
-  analyzeAndUpdateScore: (lang: string) => Promise<void>;
+  translateAndStoreOtherLanguage: (
+    currentLang: 'en' | 'de',
+    currentText: string,
+    sourceIssues: Promise<ComplianceIssue[] | undefined>,
+  ) => Promise<void>;
+  analyzeAndUpdateScore: (lang: string) => Promise<ComplianceIssue[] | undefined>;
+  aiApi: AiResourceApi;
 };
 
 function getPrivate(component: JobCreationFormComponent): ComponentPrivate {
@@ -624,6 +631,38 @@ describe('JobCreationFormComponent', () => {
   });
 
   describe('Utility / AI helpers', () => {
+    it('should apply a mapped replacement to both languages without translating again', async () => {
+      component.jobId.set('job1');
+      component.currentDescriptionLanguage.set('en');
+      const englishIssue: ComplianceIssue = {
+        id: 'issue-1',
+        language: 'en',
+        text: 'young, dynamic',
+        suggestion: 'experienced, diverse',
+        action: ComplianceIssueActionEnum.Replace,
+      };
+      const germanIssue: ComplianceIssue = {
+        ...englishIssue,
+        language: 'de',
+        text: 'jungen, dynamischen',
+        suggestion: 'erfahrenen, vielfältigen',
+      };
+      const updatedEnglish = '<p>We seek an experienced, diverse candidate.</p>';
+      const mockEditor = { applyComplianceSuggestion: vi.fn().mockReturnValue(updatedEnglish), highlightTexts: vi.fn() };
+      Object.defineProperty(component, 'jobDescriptionEditor', { value: () => mockEditor, configurable: true });
+      component.jobDescriptionEN.set('<p>We seek a young, dynamic candidate.</p>');
+      component.jobDescriptionDE.set('<p>Wir suchen einen <strong>jungen, dynamischen</strong> Kandidaten.</p>');
+      component.complianceIssues.set([englishIssue, germanIssue]);
+
+      component.onComplianceSuggestionAccepted(englishIssue);
+      await getPrivate(component).translateAndStoreOtherLanguage('en', updatedEnglish, Promise.resolve([]));
+
+      expect(component.jobDescriptionEN()).toBe(updatedEnglish);
+      expect(component.jobDescriptionDE()).toBe('<p>Wir suchen einen <strong>erfahrenen, vielfältigen</strong> Kandidaten.</p>');
+      expect(component.complianceIssues()).toEqual([]);
+      expect(mockAiStreamingService.translateJobDescriptionStream).not.toHaveBeenCalled();
+    });
+
     it.each([
       { options: [{ value: 'x' }], search: 'y', expected: undefined },
       { options: [{ value: 'a' }, { value: 'b' }], search: 'b', expected: { value: 'b' } },
@@ -726,31 +765,109 @@ describe('JobCreationFormComponent', () => {
   });
 
   describe('Translation and compliance', () => {
-    it('should clear the translation spinner once streaming ends, before compliance analysis finishes', async () => {
+    it('should reuse an identical compliance analysis while it is in flight', async () => {
+      component.jobId.set('job1');
+      fillValidJobForm(component);
+      mockJobApi.getJobById.mockReturnValue(of({ genderBiasScore: 90 }));
+      const analysisResult = new Subject<ComplianceIssue[]>();
+      const analyzeSpy = vi.spyOn(getPrivate(component).aiApi, 'analyzeJobDescriptionForCompliance').mockReturnValue(analysisResult);
+
+      const firstAnalysis = getPrivate(component).analyzeAndUpdateScore('en');
+      const secondAnalysis = getPrivate(component).analyzeAndUpdateScore('en');
+
+      expect(analyzeSpy).toHaveBeenCalledOnce();
+
+      const issues: ComplianceIssue[] = [{ id: 'issue-1', text: 'Good english skills', language: 'en' }];
+      analysisResult.next(issues);
+      analysisResult.complete();
+
+      await expect(firstAnalysis).resolves.toEqual(issues);
+      await expect(secondAnalysis).resolves.toEqual(issues);
+    });
+
+    it('should apply an accepted source action after target mapping finishes', async () => {
+      component.jobId.set('job1');
+      component.currentDescriptionLanguage.set('en');
+      component.lastTranslatedEN.set('');
+      let resolveTranslation!: (translation: string) => void;
+      mockAiStreamingService.translateJobDescriptionStream.mockReturnValue(
+        new Promise(resolve => {
+          resolveTranslation = resolve;
+        }),
+      );
+
+      const sourceIssue: ComplianceIssue = {
+        id: 'issue-1',
+        text: 'young candidate',
+        suggestion: 'experienced candidate',
+        action: ComplianceIssueActionEnum.Replace,
+        language: 'en',
+      };
+      const mappedIssue: ComplianceIssue = {
+        ...sourceIssue,
+        text: 'jungen Kandidaten',
+        suggestion: 'erfahrenen Kandidaten',
+        language: 'de',
+      };
+      vi.spyOn(getPrivate(component).aiApi, 'mapComplianceIssues').mockReturnValue(of([mappedIssue]));
+      vi.spyOn(component.autoSave, 'notifyChanged').mockImplementation(() => undefined);
+      const mockEditor = {
+        applyComplianceSuggestion: vi.fn().mockReturnValue('<p>We seek an experienced candidate.</p>'),
+        highlightTexts: vi.fn(),
+        forceUpdate: vi.fn(),
+      };
+      Object.defineProperty(component, 'jobDescriptionEditor', { value: () => mockEditor, configurable: true });
+      component.jobDescriptionEN.set('<p>We seek a young candidate.</p>');
+      component.jobDescriptionDE.set('');
+      component.complianceIssues.set([sourceIssue]);
+
+      const mapping = getPrivate(component).translateAndStoreOtherLanguage(
+        'en',
+        '<p>We seek a young candidate.</p>',
+        Promise.resolve([sourceIssue]),
+      );
+      await new Promise(resolve => setTimeout(resolve, 0));
+      component.onComplianceSuggestionAccepted(sourceIssue);
+      resolveTranslation('{"translatedText":"<p>Wir suchen einen jungen Kandidaten.</p>"}');
+      await mapping;
+
+      expect(component.jobDescriptionEN()).toBe('<p>We seek an experienced candidate.</p>');
+      expect(component.jobDescriptionDE()).toBe('<p>Wir suchen einen erfahrenen Kandidaten.</p>');
+      expect(component.complianceIssues()).toEqual([]);
+      expect(mockAiStreamingService.translateJobDescriptionStream).toHaveBeenCalledOnce();
+    });
+
+    it('should map source issues after translation without running target compliance analysis', async () => {
       component.jobId.set('job1');
       component.currentDescriptionLanguage.set('en');
       component.lastTranslatedEN.set('');
       mockAiStreamingService.translateJobDescriptionStream.mockResolvedValue('{"translatedText":"<p>Hallo</p>"}');
 
-      let resolveAnalysis!: () => void;
-      const analysisDone = new Promise<void>(resolve => {
+      const sourceIssue: ComplianceIssue = { text: 'Hello', language: 'en' };
+      const mappedIssue: ComplianceIssue = { text: 'Hallo', language: 'de' };
+      let resolveAnalysis!: (issues: ComplianceIssue[]) => void;
+      const sourceIssues = new Promise<ComplianceIssue[]>(resolve => {
         resolveAnalysis = resolve;
       });
-      const analyzeSpy = vi.spyOn(getPrivate(component), 'analyzeAndUpdateScore').mockImplementation(async () => {
-        await analysisDone;
-        component.isAnalyzing.set(false);
-      });
+      const mapSpy = vi.spyOn(getPrivate(component).aiApi, 'mapComplianceIssues').mockReturnValue(of([mappedIssue]));
 
-      const promise = getPrivate(component).translateAndStoreOtherLanguage('en', 'Hello EN');
+      const promise = getPrivate(component).translateAndStoreOtherLanguage('en', '<p>Hello</p>', sourceIssues);
       await new Promise(resolve => setTimeout(resolve, 0));
 
       expect(component.isTranslating()).toBe(false);
-      expect(component.isAnalyzing()).toBe(true);
-      expect(analyzeSpy).toHaveBeenCalledWith('de');
+      expect(mapSpy).not.toHaveBeenCalled();
 
-      resolveAnalysis();
+      resolveAnalysis([sourceIssue]);
       await promise;
-      expect(component.isAnalyzing()).toBe(false);
+
+      expect(mapSpy).toHaveBeenCalledWith({
+        toLang: 'de',
+        jobId: 'job1',
+        text: 'Hello',
+        translatedText: 'Hallo',
+        complianceIssues: [sourceIssue],
+      });
+      expect(component.complianceIssues()).toEqual([mappedIssue]);
     });
 
     it('should skip translation when the source text matches the last translated baseline', async () => {
@@ -758,10 +875,34 @@ describe('JobCreationFormComponent', () => {
       component.currentDescriptionLanguage.set('en');
       component.lastTranslatedEN.set('Hello EN');
 
-      await getPrivate(component).translateAndStoreOtherLanguage('en', 'Hello EN');
+      await getPrivate(component).translateAndStoreOtherLanguage('en', 'Hello EN', Promise.resolve([]));
 
       expect(mockAiStreamingService.translateJobDescriptionStream).not.toHaveBeenCalled();
       expect(component.isTranslating()).toBe(false);
     });
+
+    it('should map newly analyzed issues without translating synchronized descriptions again', async () => {
+      component.jobId.set('job1');
+      component.currentDescriptionLanguage.set('en');
+      component.jobDescriptionEN.set('<p>Hello dynamic team.</p>');
+      component.jobDescriptionDE.set('<p>Hallo dynamisches Team.</p>');
+      component.lastTranslatedEN.set('<p>Hello dynamic team.</p>');
+      const sourceIssue: ComplianceIssue = { id: 'new-issue', text: 'dynamic', language: 'en' };
+      const mappedIssue: ComplianceIssue = { id: 'new-issue', text: 'dynamisches', language: 'de' };
+      component.complianceIssues.set([sourceIssue]);
+      const mapSpy = vi.spyOn(getPrivate(component).aiApi, 'mapComplianceIssues').mockReturnValue(of([mappedIssue]));
+
+      await getPrivate(component).translateAndStoreOtherLanguage('en', '<p>Hello dynamic team.</p>', Promise.resolve([sourceIssue]));
+
+      expect(mockAiStreamingService.translateJobDescriptionStream).not.toHaveBeenCalled();
+      expect(mapSpy).toHaveBeenCalledWith({
+        toLang: 'de',
+        jobId: 'job1',
+        text: 'Hello dynamic team.',
+        translatedText: 'Hallo dynamisches Team.',
+        complianceIssues: [sourceIssue],
+      });
+      expect(component.complianceIssues()).toEqual([sourceIssue, mappedIssue]);
+    });
   });
 });