diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index ea038157038b..cf367e5ad514 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -888,5 +888,5 @@ return array(
     'default_quote_terms' => 'Default Quote Terms',
     'default_invoice_terms' => 'Default Invoice Terms',
     'default_invoice_footer' => 'Default Invoice Footer',
-
+    'quote_footer' => 'Quote Footer',
 );
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 1ef8dba635bf..0f6d657f2208 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -226,7 +226,7 @@
                       <ul class="nav nav-tabs" role="tablist" style="border: none">
                         <li role="presentation" class="active"><a href="#notes" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.note_to_client') }}</a></li>
                         <li role="presentation"><a href="#terms" aria-controls="terms" role="tab" data-toggle="tab">{{ trans("texts.{$entityType}_terms") }}</a></li>
-                        <li role="presentation"><a href="#footer" aria-controls="footer" role="tab" data-toggle="tab">{{ trans('texts.invoice_footer') }}</a></li>
+                        <li role="presentation"><a href="#footer" aria-controls="footer" role="tab" data-toggle="tab">{{ trans("texts.{$entityType}_footer") }}</a></li>
                     </ul>
 
                     <div class="tab-content">
@@ -843,9 +843,9 @@
             }
         }
 
-        @if (!$invoice)
+        @if (!$invoice->id)
             if (!invoice.terms) {
-                invoice.terms = wordWrapText('{!! str_replace(["\r\n","\r","\n"], '\n', addslashes($account->{"{$entityType}e_terms"})) !!}', 300);
+                invoice.terms = wordWrapText('{!! str_replace(["\r\n","\r","\n"], '\n', addslashes($account->{"{$entityType}_terms"})) !!}', 300);
             }
             if (!invoice.invoice_footer) {
                 invoice.invoice_footer = wordWrapText('{!! str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) !!}', 600);