diff --git a/invoice.php b/invoice.php
index 3b73799..2892865 100644
--- a/invoice.php
+++ b/invoice.php
@@ -25,8 +25,8 @@
     $invoice->setDate(date('Y-m-d', time()));
     $invoice->lang['to'] = "billing from";
     $invoice->lang['from'] = "billing to";
-    $invoice->setTo(['ICLC-conference / Administration', 'Leibniz-Institute for the German Language', 'R5 6-13', '68181 Mannheim', 'Germany']);
-    $invoice->setFrom([$user->first_name . ' ' . $user->last_name, $user->organization, $user->street, $user->zip . ' ' . $user->city, $user->country]);
+    $invoice->setTo(['ICLC-conference / Administration', 'Leibniz Institute for the German Language', 'R5 6-13', '68181 Mannheim', 'Germany']);
+    $invoice->setFrom([($user->title? $user->title . ' ' : ''). $user->first_name . ' ' . $user->last_name, $user->organization, $user->street, $user->zip . ' ' . $user->city, $user->country]);
     $invoice->setDue(date('Y-m-d', strtotime('+2 weeks')));
     // $invoice->hide_tofrom();
     /* Adding Items in table */
@@ -89,7 +89,7 @@
 
 If you have any questions about this invoice, please contact us via buchhaltung@ids-mannheim.de.
 ");
-    $invoice->setFooterNote("Leibniz-Institute for the German Language, Civil Law Foundation, VAT ID: DE 143 845 359");
+    $invoice->setFooterNote("Leibniz Institute for the German Language, Civil Law Foundation, VAT ID: DE 143 845 359");
 
     /* Render */
     $ret = $invoice->render('example4.pdf', 'S'); /* I => Display on browser, D => Force Download, F => local path save, S => return document path */