diff --git a/app/Models/Client.php b/app/Models/Client.php
index 3f7878f102a0..eb9251399bb7 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -468,11 +468,11 @@ class Client extends BaseModel implements HasLocalePreference
 
     public function setCompanyDefaults($data, $entity_name)
     {
-        if(strlen($this->getSetting($entity_name.'_terms')) >=1)
+        if(strlen($data['terms']) == 0)
             $data['terms'] = $this->getSetting($entity_name.'_terms');
 
-        if(strlen($this->getSetting($entity_name.'_footer')) >=1)
-            $data['footer'] =$this->getSetting($entity_name.'_footer');
+        if(strlen($data['footer']) == 0)
+            $data['footer'] = $this->getSetting($entity_name.'_footer');
 
         if(strlen($this->public_notes) >=1)
             $data['public_notes'] = $this->public_notes;