diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php
index 2e9b44d..55bda19 100644
--- a/app/Http/Controllers/ServiceController.php
+++ b/app/Http/Controllers/ServiceController.php
@@ -405,7 +405,7 @@ class ServiceController extends Controller
 					->withInput();
 			}
 
-			$o->type->forceFill(Arr::except($x,['start_at']));
+			$o->type->forceFill($validator->validated());
 
 		} elseif ($request->post($o->product->category)) {
 			$o->type->forceFill($request->post($o->product->category));
@@ -413,6 +413,10 @@ class ServiceController extends Controller
 
 		$o->type->save();
 
+		// @todo create a validator for service
+		if ($request->post('invoice_next_at'))
+			$o->invoice_next_at = $request->invoice_next_at;
+
 		// Also update our service start_at date.
 		if ($request->post('start_at'))
 			$o->start_at = $request->start_at;
diff --git a/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php
index 678c558..f1f922f 100644
--- a/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php
+++ b/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php
@@ -53,10 +53,10 @@
 	<div class="col-12 col-sm-9 col-md-6 col-xl-5">
 		@include('adminlte::widget.form_date',[
 			'label'=>'Billing Start Date',
-			'id'=>'start_at',
-			'old'=>'broadband.start_at',
-			'name'=>'broadband[start_at]',
-			'value'=>$o->start_at ? $o->start_at->format('Y-m-d') : ($o->connect_at ? $o->connect_at->format('Y-m-d') : ''),
+			'id'=>'invoice_next_at',
+			'old'=>'invoice_next_at',
+			'name'=>'invoice_next_at',
+			'value'=>$o->service->invoice_next_at ? $o->service->invoice_next_at->format('Y-m-d') : ($o->connect_at ? $o->connect_at->format('Y-m-d') : ''),
 		])
 	</div>
 </div>