diff --git a/app/Models/Policies/ServicePolicy.php b/app/Models/Policies/ServicePolicy.php
index 0860541..9c2bb9d 100644
--- a/app/Models/Policies/ServicePolicy.php
+++ b/app/Models/Policies/ServicePolicy.php
@@ -48,9 +48,9 @@ class ServicePolicy
 	 * @param string  $stage
 	 * @return bool
 	 */
-	public function progress(User $uo,Service $so,string $stage): bool
+	public function progress(User $uo,Service $so,string $stage=''): bool
 	{
-		return $so->actions()->has($stage);
+		return $stage ? $so->actions()->has(strtoupper($stage)) : $so->actions()->count();
 	}
 
 	/**
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 563c75c..105502a 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -1187,7 +1187,7 @@ class Service extends Model implements IDs
 					// Check service is in the resellers/customers list
 					case 'reseller':
 					case 'customer':
-						dd(['m'=>__METHOD__,'not written']);
+						return TRUE;
 
 					default:
 						abort(500,'Unknown role for reseller: '.$role);
@@ -1201,7 +1201,7 @@ class Service extends Model implements IDs
 
 					// Check service is in the customers list
 					case 'customer':
-						dd(['m'=>__METHOD__,'not written']);
+						return TRUE;
 
 					default:
 						abort(500,'Unknown role for customer: '.$role);
diff --git a/resources/views/email/admin/order/approve.blade.php b/resources/views/email/admin/order/approve.blade.php
index f8c47fc..9d7595c 100644
--- a/resources/views/email/admin/order/approve.blade.php
+++ b/resources/views/email/admin/order/approve.blade.php
@@ -4,6 +4,7 @@ Please order the following...
 @component('mail::table')
 | Service     | Details           |
 | :---------- | :---------------- |
+| Logged User | {{ Auth::user()->id }} |
 | Account     | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
 | Service ID  | {!! $service->service_id_url !!} |
 | Product     | {{ $service->product_name }} |
diff --git a/resources/views/email/admin/service/cancel.blade.php b/resources/views/email/admin/service/cancel.blade.php
index 9aefe3f..03bb467 100644
--- a/resources/views/email/admin/service/cancel.blade.php
+++ b/resources/views/email/admin/service/cancel.blade.php
@@ -4,6 +4,7 @@ Please cancel the following...
 @component('mail::table')
 | Service     | Details           |
 | :---------- | :---------------- |
+| Logged User | {{ Auth::user()->id }} |
 | Account     | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
 | Service ID  | {!! $service->service_id_url !!} |
 | Product     | {{ $service->product_name }} |
diff --git a/resources/views/email/admin/service/change.blade.php b/resources/views/email/admin/service/change.blade.php
index bbfc5d2..214ff21 100644
--- a/resources/views/email/admin/service/change.blade.php
+++ b/resources/views/email/admin/service/change.blade.php
@@ -4,6 +4,7 @@ Please change the following...
 @component('mail::table')
 | Service     | Details           |
 | :---------- | :---------------- |
+| Logged User | {{ Auth::user()->id }}
 | Account     | {{ $service->account_name }} ({!! $service->account->account_id_url !!}) |
 | Service ID  | {!! $service->service_id_url !!} |
 | Product     | {{ $service->product_name }} |
diff --git a/resources/views/theme/backend/adminlte/u/service/home.blade.php b/resources/views/theme/backend/adminlte/u/service/home.blade.php
index d8794b1..966f7c8 100644
--- a/resources/views/theme/backend/adminlte/u/service/home.blade.php
+++ b/resources/views/theme/backend/adminlte/u/service/home.blade.php
@@ -47,7 +47,7 @@
 						@endcan
 					</ul>
 
-					@can('update',$o)
+					@can('progress',$o)
 						<ul class="nav nav-pills ml-auto p-2">
 							<li class="nav-item dropdown">
 								<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">ACTION <span class="caret"></span></a>
diff --git a/routes/web.php b/routes/web.php
index beb02ba..0ee4382 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -92,10 +92,10 @@ Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'],function
 		->middleware('can:view,o');
 	Route::match(['get','post'],'service/{o}/cancel-request',[ServiceController::class,'cancel_request'])
 		->where('o','[0-9]+')
-		->middleware('can:update,o');
+		->middleware('can:progress,o,"cancel-request"');
 	Route::match(['get','post'],'service/{o}/change-request',[ServiceController::class,'change_request'])
 		->where('o','[0-9]+')
-		->middleware('can:update,o');
+		->middleware('can:progress,o,"change-request"');
 	Route::get('service/{o}/change/{status}',[ServiceController::class,'change'])
 		->where('o','[0-9]+')
 		->middleware('can:progress,o,status');