diff --git a/Layout/default/Product/Form.php b/Layout/default/Product/Form.php
index c73f8068b..6dbd3455c 100644
--- a/Layout/default/Product/Form.php
+++ b/Layout/default/Product/Form.php
@@ -31,7 +31,7 @@
                   <input type="hidden" name="id" value="<?=$product->id?>" />
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="name">Name</label>
+                    <label class="col-lg-2 col-form-label" for="name">Name *</label>
                     <div class="col-lg-10">
                       <input type="text" class="form-control" name="name" id="name" value="<?=$product->name?>" />
                     </div>
@@ -45,7 +45,7 @@
                   </div>
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="external">Fremdprodukt</label>
+                    <label class="col-lg-2 col-form-label" for="external">Fremdprodukt *</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control " name="external" id="external">
                         <option value="0" <?=($product->external != 1) ? "selected='selected'" : ""?>>Nein</option>
@@ -55,7 +55,7 @@
                   </div>
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="productgroup_id">Produktgruppe</label>
+                    <label class="col-lg-2 col-form-label" for="productgroup_id">Produktgruppe *</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control" name="productgroup_id" id="productgroup_id">
                         <option></option>
@@ -82,7 +82,7 @@
                   </div>
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="producttech_id">Technologie</label>
+                    <label class="col-lg-2 col-form-label" for="producttech_id">Technologie *</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control " name="producttech_id" id="producttech_id">
                         <option></option>
@@ -111,7 +111,7 @@
                   </div>
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="sla_id">SLA</label>
+                    <label class="col-lg-2 col-form-label" for="sla_id">SLA *</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control " name="sla_id" id="sla_id">
                         <option></option>
@@ -150,13 +150,13 @@
               
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="price">Setup Preis Netto (Einmalig)</label>
+                    <label class="col-lg-2 col-form-label" for="price">Setup Preis Netto (Einmalig) *</label>
                     <div class="col-lg-10">
                       <input type="text" name="price_setup" id="price_setup" class="form-control" value="<?=$this::dotToComma($product->price_setup)?>" />
                     </div>
                   </div>
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="price">Verkaufspreis Netto (Periodisch)</label>
+                    <label class="col-lg-2 col-form-label" for="price">Verkaufspreis Netto (Periodisch) *</label>
                     <div class="col-lg-10">
                       <input type="text" name="price" id="price" class="form-control" value="<?=$this::dotToComma($product->price)?>" />
                     </div>
@@ -174,7 +174,7 @@
                     </div>
                   </div>
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="billing_period">Verrechnungsperiode</label>
+                    <label class="col-lg-2 col-form-label" for="billing_period">Verrechnungsperiode *</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control " name="billing_period" id="billing_period">
                         <option value="1" <?=($product->billing_period == 1) ? "selected='selected'" : ""?>>Jährlich</option>
diff --git a/application/Product/ProductController.php b/application/Product/ProductController.php
index 2f0661beb..493853cff 100644
--- a/application/Product/ProductController.php
+++ b/application/Product/ProductController.php
@@ -81,7 +81,7 @@ class ProductController extends mfBaseController {
     $data['price'] = ($r->price) ? Layout::commaToDot($r->price) : 0;
     $data['price_setup'] = ($r->price_setup) ? Layout::commaToDot($r->price_setup) : 0;
     $data['billing_period'] = $r->billing_period;
-    $data['billing_delay'] = $r->billing_delay;
+    $data['billing_delay'] = ($r->billing_delay) ? $r->billing_delay : 0;
     $data['ivt_id'] = ($r->ivt_id) ? $r->ivt_id : null;
     $data['note'] = $r->note;