diff --git a/install/insert.sql b/install/insert.sql
index bf9022df4..946d99dd8 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -30,6 +30,7 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('session_config.handlers', 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler', 0, 0, NOW(), NOW()),
 ('company_name','', 0, 0, NOW(), NOW()),
 ('contact_email','', 0, 0, NOW(), NOW()),
+('url_site','', 0, 0, NOW(), NOW()),
 ('one_domain_foreach_lang','0', 1, 1, NOW(), NOW())
 ;
 
diff --git a/templates/pdf/invoice.html b/templates/pdf/invoice.html
index 22e6d2760..828b5786c 100644
--- a/templates/pdf/invoice.html
+++ b/templates/pdf/invoice.html
@@ -91,7 +91,7 @@
                             {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}
                                 {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                                 {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                                {$ZIPCODE} {$COUNTRY}<br/>
+                                {$ZIPCODE} {$CITY}<br/>
                                 {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                             {/loop}
                         </td>
@@ -108,7 +108,7 @@
                             {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}
                                 {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                                 {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                                {$ZIPCODE} {$COUNTRY}<br/>
+                                {$ZIPCODE} {$CITY}<br/>
                                 {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                             {/loop}
                         </td>
diff --git a/web/install/config.php b/web/install/config.php
index ca937286c..f4e3c9896 100755
--- a/web/install/config.php
+++ b/web/install/config.php
@@ -96,6 +96,10 @@ $_SESSION['install']['step'] = $step;
             <label for="site_name">Company name :</label>
             <input id="site_name" class="form-control" type="text" name="company_name" placeholder="" value="" required>
         </div>
+        <div class="form-group">
+            <label for="site_name">website url :</label>
+            <input id="site_name" class="form-control" type="text" name="url_site" placeholder="" value="http://<?php echo $_SERVER['SERVER_NAME']; ?>" required>
+        </div>
         <div class="clearfix">
             <div class="control-btn">
                 <button type="submit" class="pull-right btn btn-default btn-primary">Continue</button>
diff --git a/web/install/end.php b/web/install/end.php
index 9113a8786..e10a18cb6 100755
--- a/web/install/end.php
+++ b/web/install/end.php
@@ -43,6 +43,10 @@ if($_SESSION['install']['step'] == 5) {
     \Thelia\Model\ConfigQuery::create()
         ->filterByName('company_name')
         ->update(array('Value' => $_POST['company_name']));
+
+    \Thelia\Model\ConfigQuery::create()
+        ->filterByName('url_site')
+        ->update(array('Value' => $_POST['url_site']));
 }
 
 //clean up cache directories