diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 4453bfbac..26e6b93bf 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -604,12 +604,15 @@
                 </div>
               </div>
               
+              
               <div class="card">
                 <div class="card-body">
+                  
+                  <?php if($me->is("Admin", "netoperator")): ?>
                   <div class="form-group row">
                     <label class="col-lg-2"></label>
                     <div class="col-lg-10">
-                      <label class="form-check-label"><input type="checkbox" class="form-check-input" name="order_finished" value="1" id="order_finished" <?=($order->allow_contact) ? "checked='checked'" : ""?> /> Bestellung abschließen</label>
+                      <label class="form-check-label"><input type="checkbox" class="form-check-input" name="order_finished" value="1" id="order_finished" <?=($order->finish_date) ? "checked='checked'" : ""?> /> Bestellung abschließen</label>
                     </div>
                   </div>
                   
@@ -619,7 +622,7 @@
                       <input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=($order->finish_date) ? date("d.m.Y", $order->finish_date) : date("d.m.Y")?>" />
                     </div>
                   </div>
-                  
+                  <?php endif; ?>
                   
                   <div class="form-group row">
                     <label class="col-lg-2"></label>
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index c46777935..f22b2cf86 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -388,7 +388,7 @@ class OrderController extends mfBaseController {
     
     $order_data['edit_by'] = $this->me->id;
     //var_dump($r);
-    if($r->order_finished == "1") {
+    if($r->order_finished == "1" && $this->me->is("Admin", "netoperator")) {
       if($r->finish_date) {
         $order_data['finish_date'] = Layout::dateToInt($r->finish_date);
       } else {
diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php
index 1b0bc9233..b81341176 100644
--- a/application/Order/OrderModel.php
+++ b/application/Order/OrderModel.php
@@ -186,7 +186,7 @@ class OrderModel {
             GROUP BY `Order`.id
             ORDER BY `Order`.order_date ASC";
     
-    mfLoghandler::singleton()->debug($sql);
+    //mfLoghandler::singleton()->debug($sql);
     
     if(is_array($limit) && count($limit)) {
       if(is_numeric($limit['start']) && is_numeric($limit['count'])) {