diff --git a/legalconsenthub-backend/src/main/resources/seed/demo/section_01_angaben_zum_itsystem.yaml b/legalconsenthub-backend/src/main/resources/seed/demo/section_01_angaben_zum_itsystem.yaml
index ee82318..72fca1d 100644
--- a/legalconsenthub-backend/src/main/resources/seed/demo/section_01_angaben_zum_itsystem.yaml
+++ b/legalconsenthub-backend/src/main/resources/seed/demo/section_01_angaben_zum_itsystem.yaml
@@ -753,6 +753,14 @@ formElementSubSections:
       label: Ja (Nutzer-/Aktivitätsbezug)
       processingPurpose: DATA_ANALYSIS
       employeeDataCategory: SENSITIVE
+      visibilityConditions:
+        operator: AND
+        conditions:
+        - nodeType: LEAF
+          formElementConditionType: SHOW
+          sourceFormElementReference: sens_sichtbarkeit
+          formElementOperator: NOT_EQUALS
+          formElementExpectedValue: "Für Administratoren"
     - value: 'false'
       label: Audit-Logs
       processingPurpose: DATA_ANALYSIS
@@ -808,6 +816,14 @@ formElementSubSections:
       label: Fachlich
       processingPurpose: DATA_ANALYSIS
       employeeDataCategory: REVIEW_REQUIRED
+      visibilityConditions:
+        operator: AND
+        conditions:
+        - nodeType: LEAF
+          formElementConditionType: SHOW
+          sourceFormElementReference: sens_sichtbarkeit
+          formElementOperator: NOT_EQUALS
+          formElementExpectedValue: "Für Administratoren"
     type: CHECKBOX
     visibilityConditions:
       operator: AND
diff --git a/legalconsenthub-backend/src/main/resources/seed/template/section_01_angaben_zum_itsystem.yaml b/legalconsenthub-backend/src/main/resources/seed/template/section_01_angaben_zum_itsystem.yaml
index 482157b..2e890b1 100644
--- a/legalconsenthub-backend/src/main/resources/seed/template/section_01_angaben_zum_itsystem.yaml
+++ b/legalconsenthub-backend/src/main/resources/seed/template/section_01_angaben_zum_itsystem.yaml
@@ -721,6 +721,14 @@ formElementSubSections:
       label: Ja (Nutzer-/Aktivitätsbezug)
       processingPurpose: DATA_ANALYSIS
       employeeDataCategory: SENSITIVE
+      visibilityConditions:
+        operator: AND
+        conditions:
+        - nodeType: LEAF
+          formElementConditionType: SHOW
+          sourceFormElementReference: sens_sichtbarkeit
+          formElementOperator: NOT_EQUALS
+          formElementExpectedValue: "Für Administratoren"
     - value: 'false'
       label: Audit-Logs
       processingPurpose: DATA_ANALYSIS
@@ -776,6 +784,14 @@ formElementSubSections:
       label: Fachlich
       processingPurpose: DATA_ANALYSIS
       employeeDataCategory: REVIEW_REQUIRED
+      visibilityConditions:
+        operator: AND
+        conditions:
+        - nodeType: LEAF
+          formElementConditionType: SHOW
+          sourceFormElementReference: sens_sichtbarkeit
+          formElementOperator: NOT_EQUALS
+          formElementExpectedValue: "Für Administratoren"
     type: CHECKBOX
     visibilityConditions:
       operator: AND
diff --git a/legalconsenthub/app/components/formelements/TheCheckbox.vue b/legalconsenthub/app/components/formelements/TheCheckbox.vue
index 67bc3b4..9075184 100644
--- a/legalconsenthub/app/components/formelements/TheCheckbox.vue
+++ b/legalconsenthub/app/components/formelements/TheCheckbox.vue
@@ -3,20 +3,40 @@
 </template>
 
 <script setup lang="ts">
-import type { FormOptionDto } from '~~/.api-client'
+import type { FormElementDto, FormOptionDto } from '~~/.api-client'
+import { useFormElementVisibility } from '~/composables/useFormElementVisibility'
 
 const props = defineProps<{
   formOptions: FormOptionDto[]
+  allFormElements?: FormElementDto[]
 }>()
 
 const emit = defineEmits<{
   (e: 'update:formOptions', value: FormOptionDto[]): void
 }>()
 
-// Map options to items format expected by UCheckboxGroup
-const items = computed(() => props.formOptions.map((option) => ({ label: option.label, value: option.label })))
+const { isFormOptionVisible } = useFormElementVisibility()
+
+const visibleOptions = computed(() => {
+  if (!props.allFormElements) return props.formOptions
+  return props.formOptions.filter((opt) => isFormOptionVisible(opt.visibilityConditions, props.allFormElements!))
+})
+
+// Auto-clear hidden options that are still selected
+watchEffect(() => {
+  if (!props.allFormElements) return
+  const hiddenSelected = props.formOptions.filter(
+    (opt) => opt.value === 'true' && !isFormOptionVisible(opt.visibilityConditions, props.allFormElements!)
+  )
+  if (hiddenSelected.length === 0) return
+  emit(
+    'update:formOptions',
+    props.formOptions.map((opt) => (hiddenSelected.includes(opt) ? { ...opt, value: 'false' } : opt))
+  )
+})
+
+const items = computed(() => visibleOptions.value.map((option) => ({ label: option.label, value: option.label })))
 
-// Model value is an array of labels for checkboxes where value === 'true'
 const modelValue = computed({
   get: () => props.formOptions.filter((option) => option.value === 'true').map((option) => option.label),
   set: (selectedLabels: string[]) => {
diff --git a/legalconsenthub/app/components/formelements/TheRadioGroup.vue b/legalconsenthub/app/components/formelements/TheRadioGroup.vue
index 23775fc..acf0018 100644
--- a/legalconsenthub/app/components/formelements/TheRadioGroup.vue
+++ b/legalconsenthub/app/components/formelements/TheRadioGroup.vue
@@ -3,19 +3,41 @@
 </template>
 
 <script setup lang="ts">
-import type { FormOptionDto } from '~~/.api-client'
+import type { FormElementDto, FormOptionDto } from '~~/.api-client'
+import { useFormElementVisibility } from '~/composables/useFormElementVisibility'
 
 const props = defineProps<{
   label?: string
   formOptions: FormOptionDto[]
+  allFormElements?: FormElementDto[]
 }>()
 
 const emit = defineEmits<{
   (e: 'update:formOptions', value: FormOptionDto[]): void
 }>()
 
+const { isFormOptionVisible } = useFormElementVisibility()
+
+const visibleOptions = computed(() => {
+  if (!props.allFormElements) return props.formOptions
+  return props.formOptions.filter((opt) => isFormOptionVisible(opt.visibilityConditions, props.allFormElements!))
+})
+
+// Auto-clear selected option if it becomes hidden
+watchEffect(() => {
+  if (!props.allFormElements) return
+  const selectedOption = props.formOptions.find((opt) => opt.value === 'true')
+  if (!selectedOption) return
+  if (!isFormOptionVisible(selectedOption.visibilityConditions, props.allFormElements!)) {
+    emit(
+      'update:formOptions',
+      props.formOptions.map((opt) => ({ ...opt, value: 'false' }))
+    )
+  }
+})
+
 // Our "label" is the "value" of the radio button
-const items = computed(() => props.formOptions.map((option) => ({ label: option.label, value: option.label })))
+const items = computed(() => visibleOptions.value.map((option) => ({ label: option.label, value: option.label })))
 
 const modelValue = computed({
   get: () => props.formOptions.find((option) => option.value === 'true')?.label,