diff --git a/Layout/default/Emailtemplates/order/billing_external_energie.php b/Layout/default/Emailtemplates/order/billing_external_energie.php
index b4748336e..76b0ec2ed 100644
--- a/Layout/default/Emailtemplates/order/billing_external_energie.php
+++ b/Layout/default/Emailtemplates/order/billing_external_energie.php
@@ -17,7 +17,6 @@
       'from_email_name' => "XINON Partnerservice"
   ]);
   
-  $nne_products = [];
 ?>
 
 Rechnungspositionen
@@ -26,7 +25,6 @@ Rechnungspositionen
 Anzahl       | Produktname                                | Verrechungsperiode | Preis periodisch | Preis Herstellung
 -----------------------------------------------------------------------------------------------------------------------
 <?php foreach($order->products as $op): ?>
-<?php if($op->product->price_nne > 0.0) $nne_products[] = $op; ?>
 <?=sprintf("%-12s", substr($op->amount,0,12))?> | <?=utf8_encode(sprintf("%-42s", utf8_decode(substr($op->product->name,0,42))))?> | <?=utf8_encode(sprintf("%-18s", utf8_decode(($op->billing_period == 12) ? "Jährlich " : (($op->billing_period == 1) ? "Monatlich" : $op->billing_period."-monatlich")) ))?> | <?=sprintf("EUR %-12s", substr($op->price,0,12))?> | EUR <?=$op->price_setup?>
 
 -----------------------------------------------------------------------------------------------------------------------
diff --git a/application/Linework/LineworkController.php b/application/Linework/LineworkController.php
index 715ae2107..80203c3b4 100644
--- a/application/Linework/LineworkController.php
+++ b/application/Linework/LineworkController.php
@@ -248,8 +248,10 @@ class LineworkController extends mfBaseController {
     }
     
     $item = WorkflowitemModel::getFirst(["name" => "customer_passive_finished", "object_type" => "termination"]);
-    if(!$item->value) {
-      $item->setObjectId($termination_id);
+    $item->setObjectId($termination_id);
+    
+    if(!$item->value->id) {
+      $this->log->debug(__CLASS__."::save(): creating new value 0 for workflowitem because value of customer_passive_finished does not exist yet");
       $item->value->value_int = 0;
       $item->value->save();
     }