diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index 476ab592cdd8..3493c2201e5f 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -127,7 +127,15 @@ class EmailDefaults
     private function setFrom(): self
     {
         if (Ninja::isHosted() && $this->email->email_object->settings->email_sending_method == 'default') {
-            $this->email->email_object->from = new Address(config('mail.from.address'), $this->email->company->owner()->name());
+
+            if ($this->email->company->account->isPaid() && property_exists($this->email->email_object->settings, 'email_from_name') && strlen($this->email->email_object->settings->email_from_name) > 1) {
+                $email_from_name = $this->email->email_object->settings->email_from_name;
+            } else {
+                $email_from_name = $this->email->company->present()->name();
+            }
+
+            $this->email->email_object->from = new Address(config('mail.from.address'), $email_from_name);
+
             return $this;
         }