diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 41418ab5eae..151ac85d532 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -14,8 +14,8 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
-Webpage=Web page
-AddPage=Add page
+Webpage=Web page/container
+AddPage=Add page/container
 HomePage=Home Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 8bf42c7d530..cda5d0ee836 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -1215,7 +1215,7 @@ if ($action == 'preview')
 		$out.='<div id="bodywebsite" class="bodywebsite">'."\n";
 
         // Replace php code. Note $objectpage->content come from database and does not contains body tags.
-        $content = preg_replace('/<\?php.*\?>/ims', '<span style="background: #ddd; border: 1px solid #ccc; border-radius: 4px;">...php...</span>', $objectpage->content);
+        $content = preg_replace('/<\?php[^\?]+\?>\n*/ims', '<span style="background: #ddd; border: 1px solid #ccc; border-radius: 4px;">...php...</span>', $objectpage->content);
 
         // Replace relative link / with dolibarr URL
         $content = preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/websites/index.php?website='.$object->ref.'&pageid='.$object->fk_default_home.'"', $content, -1, $nbrep);