diff --git a/modules/qlositemap/qlositemap.php b/modules/qlositemap/qlositemap.php
index 0ea76b1c6..7b082f9dc 100644
--- a/modules/qlositemap/qlositemap.php
+++ b/modules/qlositemap/qlositemap.php
@@ -33,7 +33,6 @@ class Qlositemap extends Module
         'index' => 'home',
         'our-properties' => 'meta',
     );
-
     protected $pagesAfter = array(
         'contact' => 'contact',
         'authentication' => 'login',
@@ -85,7 +84,8 @@ class Qlositemap extends Module
     {
         return parent::install()
             && $this->registerHook('displayAdminMetaOptions')
-            && $this->registerHook('registerCronTasks');
+            && $this->registerHook('registerCronTasks')
+            && $this->ensureSitemapPageMeta();
     }
 
     public function uninstall()
@@ -191,6 +191,7 @@ class Qlositemap extends Module
             'qsm_frequencies' => $frequencies,
             'qsm_frequency' => QsmHelper::getFrequency(),
             'qsm_pages' => $pages,
+            'qsm_cms_link' => $this->context->link->getAdminLink('AdminCmsContent'),
         ));
 
         return $output.$this->display(__FILE__, 'views/templates/admin/config.tpl');
@@ -418,7 +419,6 @@ class Qlositemap extends Module
         }
 
         QsmHelper::deleteSitemapFiles();
-        $this->ensureSitemapPageMeta();
 
         $disabledPages = QsmHelper::getDisabledPages();
         foreach (Language::getLanguages(true, (int) $this->context->shop->id) as $lang) {
diff --git a/modules/qlositemap/views/templates/admin/config.tpl b/modules/qlositemap/views/templates/admin/config.tpl
index 27da5b736..b7e3551aa 100644
--- a/modules/qlositemap/views/templates/admin/config.tpl
+++ b/modules/qlositemap/views/templates/admin/config.tpl
@@ -26,7 +26,7 @@
 			<p>{l s='Please set up the following sitemap URL in your Google Search Console account:' mod='qlositemap'}<br><a href="{$qsm_index_url|escape:'html':'UTF-8'}" target="_blank">{$qsm_index_url|escape:'html':'UTF-8'}</a></p>
 			<p>{l s='A separate sitemap file is generated for each active language.' mod='qlositemap'}</p>
 			<p>{l s='The above URL is the master sitemap file. It refers to the following sub-sitemap files:' mod='qlositemap'}</p>
-			<ul class="list-unstyled">
+			<ul>
 				{foreach from=$qsm_sitemap_links item=sitemap_link}
 					<li><a href="{$qsm_store_url|escape:'html':'UTF-8'}{$sitemap_link.link|escape:'html':'UTF-8'}" target="_blank">{$sitemap_link.link|escape:'html':'UTF-8'}</a></li>
 				{/foreach}
@@ -41,8 +41,10 @@
 	<div class="panel">
 		<div class="panel-heading"><i class="icon-wrench"></i> {l s='Configure your sitemap' mod='qlositemap'}</div>
 		<div class="alert alert-info">
-			<strong>{l s='CMS pages:' mod='qlositemap'}</strong>
-			{l s='You can manage which CMS pages are included in the sitemap in two ways. If "CMS pages" is selected here, no CMS page is included in the sitemap. To leave out only specific CMS pages, set "Indexation by search engines" to No on the page itself (Preferences > CMS).' mod='qlositemap'}
+			<p><strong>{l s='CMS pages' mod='qlositemap'}</strong></p>
+			<p>{l s='You can manage which CMS pages are included in the sitemap in two ways.' mod='qlositemap'}</p>
+			<p>{l s='If "CMS pages" is selected here, no CMS page is included in the sitemap.' mod='qlositemap'}</p>
+			<p>{l s='To leave out only specific CMS pages, set "Indexation by search engines" to No on the page itself' mod='qlositemap'} (<a href="{$qsm_cms_link|escape:'html':'UTF-8'}" target="_blank">{l s='Preferences > CMS' mod='qlositemap'}</a>).</p>
 		</div>
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="qsm_frequency"><span class="label-tooltip" data-toggle="tooltip" title="{l s='How often do you update your property website?' mod='qlositemap'}">{l s='Sitemap frequency' mod='qlositemap'}</span></label>
diff --git a/modules/qlositemap/views/templates/hook/sitemap-cron-info.tpl b/modules/qlositemap/views/templates/hook/sitemap-cron-info.tpl
index 829734d55..f0a9f41b1 100644
--- a/modules/qlositemap/views/templates/hook/sitemap-cron-info.tpl
+++ b/modules/qlositemap/views/templates/hook/sitemap-cron-info.tpl
@@ -21,18 +21,26 @@
 *}
 
 	<div class="alert alert-info">
-		<p><strong>{l s='Sitemap generation' mod='qlositemap'}</strong></p>
-		<ul>
-			{if $qsm_cron_manager_enabled}
+		{if $qsm_cron_manager_enabled}
+			<p><strong>{l s='Automatic sitemap generation' mod='qlositemap'}</strong></p>
+			<ul>
 				{if $qsm_cron_task && !$qsm_cron_task.active}
-					<li><strong>{l s='Automatic:' mod='qlositemap'}</strong> {l s='automatic sitemap generation is turned off. To generate the sitemap automatically, choose Weekly, Monthly or Yearly in Sitemap generation schedule.' mod='qlositemap'}</li>
+					<li>{l s='Automatic sitemap generation is turned off.' mod='qlositemap'}</li>
+					<li>{l s='To turn it on, select Weekly, Monthly or Yearly from the Sitemap generation schedule.' mod='qlositemap'}</li>
 				{elseif $qsm_cron_task}
-					<li><strong>{l s='Automatic:' mod='qlositemap'}</strong> {l s='the sitemaps are regenerated automatically. Current schedule:' mod='qlositemap'} <strong>{$qsm_cron_task.readable|escape:'html':'UTF-8'}</strong>.</li>
+					<li>{l s='The sitemaps are regenerated automatically. Current schedule:' mod='qlositemap'} <strong>{$qsm_cron_task.readable|escape:'html':'UTF-8'}</strong>.</li>
+					<li>{l s='To change it, select another option from the Sitemap generation schedule.' mod='qlositemap'}</li>
 				{else}
-					<li><strong>{l s='Automatic:' mod='qlositemap'}</strong> {l s='the sitemaps are regenerated automatically. You can configure the schedule in the' mod='qlositemap'} <a href="{$qsm_cron_manager_link|escape:'html':'UTF-8'}">{l s='Cron Task Manager' mod='qlositemap'}</a>.</li>
+					<li>{l s='The sitemaps are regenerated automatically. You can configure the schedule in the' mod='qlositemap'} <a href="{$qsm_cron_manager_link|escape:'html':'UTF-8'}">{l s='Cron Task Manager' mod='qlositemap'}</a>.</li>
 				{/if}
-			{/if}
-			<li><strong>{l s='Manual:' mod='qlositemap'}</strong> {l s='to generate the sitemap manually, click on the "Generate sitemap" button. This erases the old sitemap files and creates new ones.' mod='qlositemap'}</li>
+				{if $qsm_cron_task}
+					<li>{l s='Save the configuration. The old sitemap files will then be erased and new ones created automatically, based on the schedule.' mod='qlositemap'}</li>
+				{/if}
+			</ul>
+		{/if}
+		<p><strong>{l s='Manual sitemap generation' mod='qlositemap'}</strong></p>
+		<ul>
+			<li>{l s='To update the sitemap at any time, click the "Generate sitemap" button. This erases the old sitemap files and creates new ones.' mod='qlositemap'}</li>
 		</ul>
 	</div>
 	{if !$qsm_cron_manager_enabled}