diff --git a/htdocs/install/doctemplates/shipment/index.html b/htdocs/install/doctemplates/shipments/index.html
similarity index 100%
rename from htdocs/install/doctemplates/shipment/index.html
rename to htdocs/install/doctemplates/shipments/index.html
diff --git a/htdocs/install/doctemplates/shipment/template_shipment.odt b/htdocs/install/doctemplates/shipments/template_shipment.odt
similarity index 100%
rename from htdocs/install/doctemplates/shipment/template_shipment.odt
rename to htdocs/install/doctemplates/shipments/template_shipment.odt
diff --git a/htdocs/install/doctemplates/supplier_proposal/index.html b/htdocs/install/doctemplates/supplier_proposals/index.html
similarity index 100%
rename from htdocs/install/doctemplates/supplier_proposal/index.html
rename to htdocs/install/doctemplates/supplier_proposals/index.html
diff --git a/htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt b/htdocs/install/doctemplates/supplier_proposals/template_supplier_proposal.odt
similarity index 100%
rename from htdocs/install/doctemplates/supplier_proposal/template_supplier_proposal.odt
rename to htdocs/install/doctemplates/supplier_proposals/template_supplier_proposal.odt
diff --git a/htdocs/install/doctemplates/websites/index.html b/htdocs/install/doctemplates/websites/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/websites/website_template-forinit.zip b/htdocs/install/doctemplates/websites/website_template-forinit.zip
new file mode 100644
index 00000000000..7a46b854734
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-forinit.zip differ
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index f6f1571b4ec..374dcf585f2 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -485,8 +485,8 @@ if (! $error && $db->connected && $action == "set")
             		'products' => 'product',
             		'projects' => 'project',
             		'proposals' => 'proposal',
-            		'shipment' => 'shipment',
-            		'supplier_proposal' => 'supplier_proposal',
+            		'shipments' => 'shipment',
+            		'supplier_proposals' => 'supplier_proposal',
             		'tasks' => 'task_summary',
             		'thirdparties' => 'thirdparty',
             		'usergroups' => 'usergroups',
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 8344a6198b8..2ad4ecca5e7 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -39,7 +39,7 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br><If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
+SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read