diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 4d84a0d11..db69201bf 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -828,6 +828,7 @@
                                           <button class="btn btn-outline-danger ml-1" id="vororttermin-delete-<?=$order->id?>" type="button" title="Vororttermin speichern" onclick="saveVororttermin(<?=$order->id?>, true)"><i class="fas fa-trash"></i></button>
                                         </div>
                                       </div>
+                                      <small id="vororttermin-<?=$order->id?>-error" class="text-danger hidden">Fehler beim Speichern!</small>
                                     </div>
                                     
                                     <div class="form-group col-lg-4 col-md-6 text-center">
@@ -1047,13 +1048,14 @@
             if(data.order.date) {
               $('#date-pill-' + id + '-install_date').html('Vorortinstallation: <span class="text-monospace"><span class="text-success">' + data.order.date + '</span></span>');
               $('#date-pill-' + id + '-install_date').addClass("active");
+              $('#cpeprovisioning_enabled-' + id).prop("checked",true);
             } else {
               $('#date-pill-' + id + '-install_date').removeClass("active");
               $('#date-pill-' + id + '-install_date').html('Vorortinstallation: <span class="text-monospace"><span class="text-success">--.--.----</span></span>');
               $('#vororttermin-' + id).val("");
+              $('#cpeprovisioning_enabled-' + id).prop("checked",false);
             }
             
-            
             setTimeout(function() {
               $('#vororttermin-' + id).removeClass("is-valid");
               $('#vororttermin-button-' + id).removeClass("btn-outline-success");
@@ -1065,6 +1067,9 @@
             $('#vororttermin-button-' + id).removeClass("btn-outline-primary");
             $('#vororttermin-' + id).addClass("is-invalid");
             $('#vororttermin-' + id).removeClass("is-valid");
+            
+            $('#vororttermin-' + id + '-error').text(data.msg);
+            $('#vororttermin-' + id + '-error').show();
           }
         },
         "json"
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index fa946f958..7d38d12d5 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -750,8 +750,15 @@ class OrderController extends mfBaseController {
       $date = null;
     }
     
+    if($date && !$order->install_date && is_array($order->terminations)) {
+      $term = $order->terminations[0];
+      if(!$term->getWorkflowvalue("pop_id")) {
+        $this->returnJson(["status" => "error", "msg" => "Kein POP im Leitungsbau !", "order" => ['id' => $order_id]]);
+      }
+    }
     
     $order->install_date = $date;
+    $order->cpeprovisioning_enabled = ($date) ? 1 : 0;
     $order->save();
     
     $this->returnJson(["status" => "OK", "order" => ['id' => $order_id, 'date' => ($date) ? date('d.m.Y', $date) : ""]]);
@@ -782,7 +789,7 @@ class OrderController extends mfBaseController {
 
     $term = $order->terminations[0];
     if($enabled && !$term->getWorkflowvalue("pop_id")) {
-      $this->returnJson(["status" => "error", "msg" => "Kein POP im Leitungsbau!", "order" => ['id' => $order_id, "enabled" => 0]]);
+      $this->returnJson(["status" => "error", "msg" => "Kein POP im Leitungsbau !", "order" => ['id' => $order_id, "enabled" => 0]]);
     }
     
     $order->cpeprovisioning_enabled = ($enabled) ? 1 : 0;