diff --git a/src/app/Admin/Controllers/Analytics/OrderSourceController.php b/src/app/Admin/Controllers/Analytics/OrderSourceController.php
index eb619e97..857efe67 100644
--- a/src/app/Admin/Controllers/Analytics/OrderSourceController.php
+++ b/src/app/Admin/Controllers/Analytics/OrderSourceController.php
@@ -5,7 +5,7 @@
 use App\Models\Orders\Order;
 use Encore\Admin\Grid;
 
-class OrderSourceController extends AbstractOrderItemAnalyticController
+class OrderSourceController extends AbstractCustomerAnalyticController
 {
     /**
      * Title for current resource.
@@ -38,6 +38,8 @@ protected function getPreparedGrid(): Grid
         $grid = new Grid(new Order());
 
         $grid->model()->selectRaw($this->getSelectSql())
+            ->withExpression('LastUserOrders', $this->getLastUserOrdersQuery())
+            ->leftJoin('users', 'users.id', '=', 'orders.user_id')
             ->leftJoin('order_items', 'orders.id', '=', 'order_items.order_id')
             ->groupBy('instance_name');
 
diff --git a/src/app/Admin/Controllers/Analytics/OrderTypeController.php b/src/app/Admin/Controllers/Analytics/OrderTypeController.php
index 04ecebae..f2cdd504 100644
--- a/src/app/Admin/Controllers/Analytics/OrderTypeController.php
+++ b/src/app/Admin/Controllers/Analytics/OrderTypeController.php
@@ -5,7 +5,7 @@
 use App\Models\Orders\Order;
 use Encore\Admin\Grid;
 
-class OrderTypeController extends AbstractOrderItemAnalyticController
+class OrderTypeController extends AbstractCustomerAnalyticController
 {
     /**
      * Title for current resource.
@@ -38,6 +38,8 @@ protected function getPreparedGrid(): Grid
         $grid = new Grid(new Order());
 
         $grid->model()->selectRaw($this->getSelectSql())
+            ->withExpression('LastUserOrders', $this->getLastUserOrdersQuery())
+            ->leftJoin('users', 'users.id', '=', 'orders.user_id')
             ->leftJoin('order_items', 'orders.id', '=', 'order_items.order_id')
             ->groupBy('order_type');
 
diff --git a/src/public/templates/envelope_template.xlsx b/src/public/templates/envelope_template.xlsx
index 10e512ad..12af0cfb 100644
Binary files a/src/public/templates/envelope_template.xlsx and b/src/public/templates/envelope_template.xlsx differ