diff --git a/mysyde/intranet/admin/edit_facility.inc.php b/mysyde/intranet/admin/edit_facility.inc.php
index d47e054..6b8d3f8 100644
--- a/mysyde/intranet/admin/edit_facility.inc.php
+++ b/mysyde/intranet/admin/edit_facility.inc.php
@@ -99,7 +99,8 @@ function save_facility() {
             $messages[] = '<div class="successbox">' . $translation->get("role_msg_success2") . '</div>';
         } 
         saveMandantLink($input_id);
-        edit_role($input_id, $messages);
+        saveLinkedEinrichts($input_id);
+        edit_facility($input_id, $messages);
     } else {
         header('EDIT_ERROR: 1');
         // $input_role["id"]                = $_POST["input_id"];
@@ -110,6 +111,28 @@ function save_facility() {
     }
 }
 
+function saveLinkedEinrichts($einricht_id) {
+    $einricht_id = (int)$einricht_id;
+    if ($einricht_id <= 0) return;
+
+    // Alle alten Verknüpfungen löschen
+    mysqli_query($GLOBALS['mysql_con'],
+        "DELETE FROM organigramm_einricht_link WHERE einricht_id = $einricht_id");
+
+    // Neue Verknüpfungen speichern
+    $raw = trim($_POST['linked_einrichts'] ?? '');
+    if ($raw === '') return;
+
+    foreach (explode(',', $raw) as $linkedId) {
+        $linkedId = (int)trim($linkedId);
+        if ($linkedId > 0 && $linkedId !== $einricht_id) {
+            mysqli_query($GLOBALS['mysql_con'],
+                "INSERT IGNORE INTO organigramm_einricht_link (einricht_id, linked_einricht_id)
+                 VALUES ($einricht_id, $linkedId)");
+        }
+    }
+}
+
 function saveMandantLink($role_id){
     $mandant_id = $_POST['select_mandant'];
     $mandante = explode(',', $mandant_id);
diff --git a/mysyde/intranet/admin/edit_facility_cardform.inc.php b/mysyde/intranet/admin/edit_facility_cardform.inc.php
index 43ff729..b076c69 100644
--- a/mysyde/intranet/admin/edit_facility_cardform.inc.php
+++ b/mysyde/intranet/admin/edit_facility_cardform.inc.php
@@ -1,48 +1,101 @@
-<?php
-$formname    = "form_facility_card";
-$translation = \DynCom\mysyde\common\classes\Registry::get("translation");
-$inputname   = "input_id";
-?>
-
-<div id="overlaycrumb">
-    <?php if ($input_role["id"] == "") {
-        echo $translation->get("new_facility");
-    } else {
-        echo $translation->get("edit_facility");
-    }
-    ?>
-    <div id="closeoverlay" onclick="disableOverlay();"></div>
-</div>
-    <ul class="toolbar_menu">
-        <?= button("save", $translation->get("save_and_close"), $formname, "loadCard('save', true, '', true)"); ?>
-        <li>
-            <ul>
-                <?php
-                if ($input_role["id"] != "") {
-                    echo button("delete", $translation->get("delete"), $formname, "loadCard('delete', true, '{$translation->get('delete_role_confirm')}', true)", "", FALSE);
-                }
-                ?>
-                <?= button("reset", $translation->get("restore"), $formname, "?action=edit", "", FALSE); ?>
-            </ul>
-        </li>
-    </ul>
-
-<?php
-if ($messages !== null) {
-    if (count($messages)) {
-        echo '<div id="overlayMessages">' . join("\r\n", $messages) . '</div>';
-    }
-}
-
- 
-?>
-
-<form id="<?= $formname ?>" name="<?= $formname ?>" method="post">
-    <input name="input_id" type="hidden" value="<?= $input_role["id"] ?>">
-
-    <table class="cardform" border="0" cellspacing="0" cellpadding="0">
-        <div>
-            <? input($translation->get("description"), "input_description", "text", $input_role["description"], 100) ?>
-        </div>
-    </table>
-</form>
\ No newline at end of file
+<?php
+$formname    = "form_facility_card";
+$translation = \DynCom\mysyde\common\classes\Registry::get("translation");
+$inputname   = "input_id";
+
+$currentId = (int)($input_role["id"] ?? 0);
+
+// Alle Einrichtungen außer der aktuellen laden
+$allEinrichts = [];
+$qAll = mysqli_query($GLOBALS['mysql_con'],
+    "SELECT id, description FROM organigramm_einricht ORDER BY description ASC");
+while ($row = mysqli_fetch_assoc($qAll)) {
+    if ((int)$row['id'] !== $currentId) {
+        $allEinrichts[] = $row;
+    }
+}
+
+// Bereits verknüpfte Einrichtungen laden
+$preselect = [];
+if ($currentId > 0) {
+    $qLinked = mysqli_query($GLOBALS['mysql_con'],
+        "SELECT linked_einricht_id FROM organigramm_einricht_link WHERE einricht_id = $currentId");
+    while ($row = mysqli_fetch_assoc($qLinked)) {
+        $preselect[] = $row['linked_einricht_id'];
+    }
+}
+?>
+
+<div id="overlaycrumb">
+    <?php if ($input_role["id"] == "") {
+        echo $translation->get("new_facility");
+    } else {
+        echo $translation->get("edit_facility");
+    } ?>
+    <div id="closeoverlay" onclick="disableOverlay();"></div>
+</div>
+
+<ul class="toolbar_menu">
+    <?= button("save", $translation->get("save"), $formname, "loadCard('save', true)"); ?>
+    <?= button("save", $translation->get("save_and_close"), $formname, "loadCard('save', true, '', true)"); ?>
+    <li>
+        <ul>
+            <?php if ($input_role["id"] != ""): ?>
+                <?= button("delete", $translation->get("delete"), $formname, "loadCard('delete', true, '{$translation->get('delete_role_confirm')}', true)", "", FALSE); ?>
+            <?php endif; ?>
+            <?= button("reset", $translation->get("restore"), $formname, "?action=edit", "", FALSE); ?>
+        </ul>
+    </li>
+</ul>
+
+<?php if ($messages !== null && count($messages)): ?>
+    <div id="overlayMessages"><?= join("\r\n", $messages) ?></div>
+<?php endif; ?>
+
+<form id="<?= $formname ?>" name="<?= $formname ?>" method="post">
+    <input name="input_id" type="hidden" value="<?= $input_role["id"] ?>">
+
+    <table class="cardform" border="0" cellspacing="0" cellpadding="0">
+        <div>
+            <? input($translation->get("description"), "input_description", "text", $input_role["description"], 100) ?>
+        </div>
+        <tr>
+            <div class="label">Verknüpfte Einrichtungen</div>
+            <div class="einricht-link bc-select-ui ui fluid multiple search selection dropdown" style="clear:both; display:inline-block;">
+                <input type="hidden" name="linked_einrichts">
+                <i class="dropdown icon"></i>
+                <div class="default text">Einrichtungen auswählen…</div>
+                <div class="menu">
+                    <?php foreach ($allEinrichts as $e): ?>
+                        <div class="item" data-value="<?= (int)$e['id'] ?>">
+                            <?= htmlspecialchars($e['description']) ?>
+                        </div>
+                    <?php endforeach; ?>
+                </div>
+            </div>
+        </tr>
+    </table>
+</form>
+
+<script type="text/javascript" src="/plugins/jquery/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="/plugins/Semantic-UI-master/semantic.min.js"></script>
+<link rel="stylesheet" type="text/css" href="/plugins/Semantic-UI-master/bc-semantic.css?time=<?= filemtime($_SERVER['DOCUMENT_ROOT'] . '/plugins/Semantic-UI-master/bc-semantic.css') ?>">
+<script>
+    var $y = jQuery.noConflict();
+    $y(document).ready(function () {
+        var $drop = $y('.einricht-link.ui.fluid.multiple.dropdown');
+        var $hidden = $y('input[name="linked_einrichts"]');
+
+        $drop.dropdown({
+            onChange: function (value) {
+                $hidden.val(value);
+            }
+        });
+
+        var preselect = <?= json_encode($preselect) ?>.map(String);
+        if (preselect.length) {
+            $drop.dropdown('set selected', preselect);
+            $hidden.val(preselect.join(','));
+        }
+    });
+</script>