diff --git a/Layout/default/Contract/Form.php b/Layout/default/Contract/Form.php
index 0b5a4d714..d3703e3b4 100644
--- a/Layout/default/Contract/Form.php
+++ b/Layout/default/Contract/Form.php
@@ -166,11 +166,11 @@
                       <div class="input-group mb-3">
                         <div class="input-group-prepend">
                           <select class="form-control" name="links[<?=$linknum?>][type]">
-                            <option value="link">Verknüpfung</option>
-                            <option value="upgrade">Upgrade</option>
-                            <option value="downgrade">Downgrade</option>
-                            <option value="relocation">Umzug</option>
-                            <option value="productchange">Produktwechsel</option>
+                            <option value="link">Verknüpfung mit</option>
+                            <option value="upgrade">Upgrade von</option>
+                            <option value="downgrade">Downgrade von</option>
+                            <option value="relocation">Umzug von</option>
+                            <option value="productchange">Produktwechsel von</option>
                           </select>
                         </div>
                         <!--input type="text" class="form-control" name="links[<?=$linknum?>][contract_id]" id="links_<?=$linknum?>_contract_id" placeholder="Contact ID oder Suche nach Produkt, Matchcode, Kunde" value="<?=$contract->cancel_date?>"-->
diff --git a/application/Contract/ContractController.php b/application/Contract/ContractController.php
index 6ab6b9345..2069beb4c 100644
--- a/application/Contract/ContractController.php
+++ b/application/Contract/ContractController.php
@@ -61,7 +61,19 @@ class ContractController extends mfBaseController {
   }
   
   protected function editAction() {
+    $id = $this->request->id;
+    if(!is_numeric($id) || !$id) {
+      $this->layout()->setFlash("Vertrag nicht gefunden", "error");
+      $this->redirect("Contract");
+    }
     
+    $contract = new Contract($id);
+    if(!$contract->id) {
+      $this->layout()->setFlash("Vertrag nicht gefunden", "error");
+      $this->redirect("Contract");
+    }
+    
+    $this->layout()->set("contract", $contract);
     
     return $this->addAction();
   }