diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index c09e010c93f2..919ec79a12d4 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -400,9 +400,9 @@ class InvoiceController extends BaseController
                 Utils::trackViewed($client->getDisplayName(), ENTITY_CLIENT, $url);
             }
 
-            /*if (!empty(Input::get('pdfupload')) && strpos(Input::get('pdfupload'), 'data:application/pdf;base64,') === 0) {
-                $this->storePDF(Input::get('pdfupload'), $input->invoice->public_id);
-            }*/
+            if (!empty(Input::get('pdfupload')) && strpos(Input::get('pdfupload'), 'data:application/pdf;base64,') === 0) {
+                $this->storePDF(Input::get('pdfupload'), $invoice->id);
+            }
 
             if ($action == 'clone') {
                 return $this->cloneInvoice($publicId);
@@ -547,11 +547,11 @@ class InvoiceController extends BaseController
         return View::make('invoices.history', $data);
     }
     
-    private function storePDF($encodedString, $public_id)
+    private function storePDF($encodedString, $invoiceId)
     {
         $uploadsDir = storage_path().'/pdfcache/';
         $encodedString = str_replace('data:application/pdf;base64,', '', $encodedString);
-        $name = 'cache-'.$public_id.'.pdf';
+        $name = 'cache-'.$invoiceId.'.pdf';
         
         if (file_put_contents($uploadsDir.$name, base64_decode($encodedString)) !== false) {
             $finfo = new finfo(FILEINFO_MIME);
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 78ad668ebae4..86036d11f87e 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -328,7 +328,9 @@ class PaymentController extends \BaseController
             } else {
                 return self::do_payment($invitationKey, false);
             }
-        }
+        } else {
+	   Session::put('payment_type', PAYMENT_TYPE_ANY);
+	}
 
         $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail();
         $invoice = $invitation->invoice;
diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index 73cdddbe6fed..f3774974f78b 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -25,7 +25,7 @@ class Mailer
                 $invoice = Invoice::find($data['id']);
                 $invoice->load('account');
                 $accountAttributes = $invoice->account()->getParent()->getRelations()['account']->getAttributes();
-                $pdfPath = storage_path().'/pdfcache/cache-'.$invoice->getAttributes()['public_id'].'.pdf';
+                $pdfPath = storage_path().'/pdfcache/cache-'.$invoice->id.'.pdf';
                 
                 if($accountAttributes['pdf_email_attachment'] === 1 && file_exists($pdfPath)) {
                     $message->attach(
diff --git a/database/seeds/ConstantsSeeder.php b/database/seeds/ConstantsSeeder.php
index 85b7d18ca9a6..56d18d6ff884 100644
--- a/database/seeds/ConstantsSeeder.php
+++ b/database/seeds/ConstantsSeeder.php
@@ -154,7 +154,7 @@ class ConstantsSeeder extends Seeder
         Currency::create(array('name' => 'New Zealand Dollar', 'code' => 'NZD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 		Currency::create(array('name' => 'Vietnamese Dong', 'code' => 'VND', 'symbol' => 'VND ', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'));
         Currency::create(array('name' => 'Swiss Franc', 'code' => 'CHF', 'symbol' => 'CHF ', 'precision' => '2', 'thousand_separator' => '\'', 'decimal_separator' => '.'));
-
+        Currency::create(array('name' => 'Guatemalan Quetzal', 'code' => 'GTQ', 'symbol' => 'Q', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
 
 		DatetimeFormat::create(array('format' => 'd/M/Y g:i a', 'label' => '10/Mar/2013'));
 		DatetimeFormat::create(array('format' => 'd-M-Yk g:i a', 'label' => '10-Mar-2013'));
diff --git a/public/built.js b/public/built.js
index a07bb5754085..48468f6878dd 100644
--- a/public/built.js
+++ b/public/built.js
@@ -31609,6 +31609,7 @@ function GetPdf(invoice, javascript){
     doc.setFontSize('8');
     SetPdfColor(invoice.invoice_design_id == 2 || invoice.invoice_design_id == 3 ? 'White' : 'Black',doc);
     var top = doc.internal.pageSize.height - layout.marginLeft;
+    if (!invoice.is_pro) top -= 25;
     var numLines = invoice.invoice_footer.split("\n").length - 1;
     doc.text(layout.marginLeft, top - (numLines * 8), invoice.invoice_footer);
   }
diff --git a/public/js/script.js b/public/js/script.js
index eecfa9302546..4b0d64875d6a 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -86,6 +86,7 @@ function GetPdf(invoice, javascript){
     doc.setFontSize('8');
     SetPdfColor(invoice.invoice_design_id == 2 || invoice.invoice_design_id == 3 ? 'White' : 'Black',doc);
     var top = doc.internal.pageSize.height - layout.marginLeft;
+    if (!invoice.is_pro) top -= 25;
     var numLines = invoice.invoice_footer.split("\n").length - 1;
     doc.text(layout.marginLeft, top - (numLines * 8), invoice.invoice_footer);
   }