diff --git a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
index 8f8df53f400c..496f2747d740 100644
--- a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
+++ b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
@@ -62,12 +62,6 @@ class StoreSubscriptionRequest extends Request
     {
         $input = $this->all();
 
-        // if(array_key_exists('webhook_configuration', $input) && (!is_object(json_decode($input['webhook_configuration']))))
-        //     $input['webhook_configuration'] = new \stdClass;
-        
-        // if(!array_key_exists('webhook_configuration', $input))
-        //     $input['webhook_configuration'] = new \stdClass;
-
         $this->replace($input);
     }
 }
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index d0778797c9e9..1c888095cb99 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -21,6 +21,7 @@ class Subscription extends BaseModel
     use HasFactory, SoftDeletes;
 
     protected $fillable = [
+        'assigned_user_id',
         'product_ids',
         'recurring_product_ids',
         'frequency_id',
diff --git a/app/Transformers/SubscriptionTransformer.php b/app/Transformers/SubscriptionTransformer.php
index 47b337bf718d..ea496f3291b6 100644
--- a/app/Transformers/SubscriptionTransformer.php
+++ b/app/Transformers/SubscriptionTransformer.php
@@ -40,6 +40,7 @@ class SubscriptionTransformer extends EntityTransformer
             'user_id' => $this->encodePrimaryKey($subscription->user_id),
             'group_id' => $this->encodePrimaryKey($subscription->group_id),
             'product_ids' => (string)$subscription->product_ids,
+            'name' => (string)$subscription->name,
             'recurring_product_ids' => (string)$subscription->recurring_product_ids,
             'assigned_user_id' => $this->encodePrimaryKey($subscription->assigned_user_id),
             'company_id' => $this->encodePrimaryKey($subscription->company_id),
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 45512439cd73..23a37b03cc8a 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -192,6 +192,7 @@ class HtmlEngine
         $data['$taxes'] = ['value' => Number::formatMoney($this->entity_calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')];
         $data['$invoice.taxes'] = &$data['$taxes'];
 
+        $data['$user.name'] = ['value' => $this->entity->user->present()->name(), 'label' => ctrans('texts.name')];
         $data['$user_iban'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company1', $this->settings->custom_value1, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company1')];
         $data['$invoice.custom1'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice1', $this->entity->custom_value1, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice1')];
         $data['$invoice.custom2'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'invoice2', $this->entity->custom_value2, $this->client) ?: ' ', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'invoice2')];
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index 3ffee1fd4638..b130585ac28d 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -79,6 +79,7 @@ class SystemHealth
             'exec' => (bool)self::checkExecWorks(),
             'open_basedir' => (bool)self::checkOpenBaseDir(),
             'mail_mailer' => (string)self::checkMailMailer(),
+            'flutter_renderer' => (string)config('ninja.flutter_canvas_kit'),
         ];
     }
 
diff --git a/database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php b/database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php
new file mode 100644
index 000000000000..430c5131ba49
--- /dev/null
+++ b/database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ModifyColumnOnSubscriptionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('subscriptions', function (Blueprint $table) {
+            $table->unsignedInteger('assigned_user_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}