diff --git a/Layout/default/Emailtemplates/order/billing_external_energie.php b/Layout/default/Emailtemplates/order/billing_external_energie.php
index 76b0ec2ed..a5a441533 100644
--- a/Layout/default/Emailtemplates/order/billing_external_energie.php
+++ b/Layout/default/Emailtemplates/order/billing_external_energie.php
@@ -6,18 +6,28 @@
   if($op->billing_delay) {
     $billing_start = strtotime("+".$op->billing_delay." months");
   }
-  //var_dump($order->terminations[0]->building);exit;
+  
+  $subject = "";
+  if($order->upgrade) {
+    $subject .= "[UPGRADE] ";
+  }
+  $subject .= $order->partner_number." - "
+              ."hergestellt am ".date("d.m.Y", $order->finish_date) . " - "
+              ."Verrechnung ab ".date("m", $billing_start)."/".date("Y", $billing_start)." - "
+              .str_replace("\n", " ", str_replace("\r", "", $order->owner->getCompanyOrName()));
+  
   $this->setReturnValue([
-      'subject' => $order->partner_number." - "
-                    ."hergestellt am ".date("d.m.Y", $order->finish_date) . " - "
-                    ."Verrechnung ab ".date("m", $billing_start)."/".date("Y", $billing_start)." - "
-                    .str_replace("\n", " ", str_replace("\r", "", $order->owner->getCompanyOrName())),
+      'subject' => $subject,
                     
       'from_email' => TT_OUTGOING_EMAIL,
       'from_email_name' => "XINON Partnerservice"
   ]);
   
 ?>
+<?php if($order->upgrade): ?>
+Achtung: UPGRADE
+<?php endif; ?>
+
 
 Rechnungspositionen
 ====================
diff --git a/Layout/default/Emailtemplates/order/int_billing_info.php b/Layout/default/Emailtemplates/order/int_billing_info.php
index 4ac1d2989..40f640a1f 100644
--- a/Layout/default/Emailtemplates/order/int_billing_info.php
+++ b/Layout/default/Emailtemplates/order/int_billing_info.php
@@ -11,13 +11,19 @@
   if($op->billing_delay) {
     $billing_start = strtotime("+".$op->billing_delay." months");
   }
-  //var_dump($order->terminations[0]->building);exit;
-  $this->setReturnValue([
-      'subject' => $order->terminations[0]->building->network->name." - "
+  
+  $subject = "";
+  if($order->upgrade) {
+    $subject .= "[UPGRADE] ";
+  }
+  $subject .= $order->terminations[0]->building->network->name." - "
                     .(($order->terminations[0]->building->networksection_id) ? $order->terminations[0]->building->networksection->name : "<kein Bauabschnitt>")." - "
                     ."Verrechnung ab ".date("m", $billing_start)."/".date("Y", $billing_start)." - "
                     .$order->owner->customer_number." - "
-                    .str_replace("\n", "", str_replace("\r\n", " ", $order->owner->getCompanyOrName()))." - ",
+                    .str_replace("\n", "", str_replace("\r\n", " ", $order->owner->getCompanyOrName()))." - ";
+  
+  $this->setReturnValue([
+      'subject' => $subject,
                     
       'from_email' => TT_OUTGOING_EMAIL,
       'from_email_name' => TT_OUTGOING_EMAIL_NAME
@@ -25,6 +31,10 @@
   
   $nne_products = [];
 ?>
+<?php if($order->upgrade): ?>
+Achtung: UPGRADE
+<?php endif; ?>
+
 
 Rechnungspositionen
 ====================
diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 695d9b5a8..db83bac30 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -143,6 +143,16 @@
                             </div>
                           </div>
 
+                          <div class="row">
+                            <div class="col-lg-6">
+                              <div class="form-group">
+                                <label class="form-label" for="owner_uid">UID</label>
+                                <input type="text" class="form-control" name="owner_uid" id="owner_uid" value="<?=$order->owner_uid?>" />
+                              </div>
+                            </div>
+                            
+                          </div>
+                          
                         </div>
                       </div>
                       
@@ -251,6 +261,16 @@
                               </div>
                             </div>
                           </div>
+                          
+                          <div class="row">
+                            <div class="col-lg-6">
+                              <div class="form-group">
+                                <label class="form-label" for="billing_uid">UID</label>
+                                <input type="text" class="form-control" name="billing_uid" id="billing_uid" value="<?=$order->billing_uid?>" />
+                              </div>
+                            </div>
+                            
+                          </div>
 
                         </div>
                       </div>