diff --git a/Layout/default/Contract/include/productchange-action.php b/Layout/default/Contract/include/productchange-action.php
index 58470eb0d..45fa8728a 100644
--- a/Layout/default/Contract/include/productchange-action.php
+++ b/Layout/default/Contract/include/productchange-action.php
@@ -1,3 +1,20 @@
+<div class="card">
+    <div class="card-body">
+        <div class="alert alert-purple">
+            <p>
+                Wählen Sie das neue Produkt aus oder ändern Sie den Preis.<br />
+                Wenn ein <strong>Fertigstellungsdatum</strong> eingetragen wird, wird das alte Produkt am Vortag
+                gekündigt.<br />
+                <strong>Ohne Fertigstellungsdatum</strong> wird das neue Produkt händisch nach der technischen Produktanpassung fertiggestellt.
+            </p>
+            <p>
+                <strong>Verknüpfte Produkte</strong> können beibehalten oder gekündigt werden.<br />
+                Um beim verknüpften Produkt ein Kündigungsdatum einzutragen, muss beim Hauptprodukt ein Fertigstellungsdatum eingetragen sein.
+            </p>
+        </div>
+    </div>
+</div>
+
 <div class="card border-top-purple">
     <div class="card-body">
         <h4 class="text-center mb-3">Neuer Contract</h4>
@@ -140,7 +157,7 @@
                         <div class="form-group row">
                             <label class="col-lg-2 col-form-label" for="billing_delay">Fertigstellungsdatum</label>
                             <div class="col-lg-10">
-                                <input type="text" class="form-control" name="finish_date" id="finish_date" value="" />
+                                <input type="text" class="form-control" name="finish_date" id="finish_date" value="" onchange="finishDateChange()" />
                             </div>
                         </div>
 
@@ -356,4 +373,12 @@
         }
         //link-<?=$link->id?>-action-cancel
     }
+
+    function finishDateChange() {
+        $("#link-table input.link-cancel:checked").each(function() {
+            var match = this.id.match(/^link-(\d+)-action/);
+            link_id = match[1];
+            linkActionChange(link_id);
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 95ec4fe67..ad50c05d8 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -143,7 +143,7 @@
           <div class="col-12">
             <div class="float-right">
               <a class="btn btn-lg btn-primary mb-2" href="<?=self::getUrl("Order", "add")?>"><i class="fas fa-fw fa-square-plus "></i> Neue Bestellung anlegen</a>
-              <!--a class="btn btn-lg btn-purple mb-2 ml-2" href="<?=self::getUrl("Order", "addUpgrade")?>"><i class="fas fa-fw fa-square-up "></i> Upgrade eingeben</a-->
+              <a class="btn btn-lg btn-purple mb-2 ml-2" href="<?=self::getUrl("Order", "addUpgrade")?>"><i class="fas fa-fw fa-square-up "></i> Upgrade eingeben</a>
             </div>
           </div>
         </div>
diff --git a/Layout/default/Order/Productchange.php b/Layout/default/Order/Productchange.php
deleted file mode 100644
index 73c0ba386..000000000
--- a/Layout/default/Order/Productchange.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-$urlfilter = [];
-if($s) {
-    $urlfilter['s'] = $s;
-}
-if($noTermProducts) {
-    $urlfilter['noTermProducts'] = 1;
-}
-if(isset($filter) && is_array($filter) && count($filter)) {
-    $urlfilter["filter"] = $filter;
-}
-$posturl = self::getUrl("Order", "save", $urlfilter);
-?>
-<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
-
-<!-- start page title -->
-<div class="row">
-    <div class="col-12">
-        <div class="page-title-box">
-            <div class="page-title-right">
-                <ol class="breadcrumb m-0">
-                    <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
-                    <li class="breadcrumb-item"><a href="<?=self::getUrl("Order")?>">Bestellungen</a></li>
-                    <li class="breadcrumb-item active">Produktwechsel</li>
-                </ol>
-            </div>
-            <h4 class="page-title">Bestellungen</h4>
-        </div>
-    </div>
-</div>
-<!-- end page title -->
-
-<div class="row">
-    <div class="col-lg-12">
-
-        <div class="card no-shadow">
-            <div class="card-body bg-light">
-                <h4 class="mb-2">Produktwechsel</h4>
-
-                <form class="form-horizontal" method="post" action="<?=$posturl?>" name="orderForm" id="orderForm" enctype="multipart/form-data">
-                    <div class="card">
-                        <div class="card-body">
-
-                            <div class="row">
-                                <div class="col-lg-6" id="owner-block">
-
-
-                                    <div class="form-group row">
-
-                                        <div class="col-lg-12 mb-2">
-                                            <h4>Vertragsinhaber auswählen</h4>
-
-                                            <select class="form-control basicAutoComplete" autocomplete="off" name="owner_id" id="owner_id" data-url="<?=self::getUrl('Address','api')?>?do=findAddress&autocomplete=1" placeholder="Tippen zum Suchen... (Bestandskunden)" data-noresults-text="Keine Suchergebnisse">
-                                                <option></option>
-                                            </select>
-
-                                        </div>
-
-                                        <div class="card" id="product-list">
-                                            <div class="card-body">
-                                                <table>
-                                                    <thead>
-                                                        <th>Contract ID</th>
-                                                        <th>Produkt</th>
-                                                        <th>Matchcode</th>
-                                                        <th>Preis p.P.</th>
-                                                        <th>Herstellungskosten</th>
-                                                        <th>Fertigstellung</th>
-                                                        <th>Kündigung</th>
-                                                    </thead>
-                                                    <tbody>
-
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </form>
-            </div>
-        </div>
-
-    </div>
-</div>
-
-<script type="text/javascript">
-
-
-
-
-</script>
-
-
-<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
diff --git a/application/Contract/ContractController.php b/application/Contract/ContractController.php
index bb216f2e8..c2fae4eb4 100644
--- a/application/Contract/ContractController.php
+++ b/application/Contract/ContractController.php
@@ -435,7 +435,11 @@ class ContractController extends mfBaseController
 
         if (!$new_contract_id) {
             $this->layout()->setFlash("Neuer Contract konnte nicht gespeichert werden", "error");
-            $this->redirect("Contract", "productchange", ["contract_id" => $id]);
+            if($f == "o") {
+                $this->redirect("Contract", "productchange", ["contract_id" => $id, "f" => $f]);
+            } else {
+                $this->redirect("Contract", "productchange", ["contract_id" => $id]);
+            }
         }
 
         if($contract_cancel_date) {