diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index bf486ea3d4e..5605fa4fb63 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -323,130 +323,6 @@ print '<br>';
 
 clearstatcache();
 
-if ($mode == 'template') {
-	// Themes and themes options
-	showSkins(null, 1);
-}
-
-if ($mode == 'dashboard') {
-	print '<div class="div-table-responsive-no-min">';
-	print '<table summary="blockdashboard" class="noborder centpercent editmode tableforfield">';
-
-	// Message of the day on home page
-	$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'));
-	complete_substitutions_array($substitutionarray, $langs);
-
-	print '<tr class="oddeven width25p"><td>';
-	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>';
-	foreach ($substitutionarray as $key => $val) {
-		$texthelp .= $key . '<br>';
-	}
-	print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday');
-
-	print '</td><td>';
-
-	$doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD) ? $conf->global->MAIN_MOTD : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
-	$doleditor->Create();
-
-	print '</td></tr>' . "\n";
-
-	/* no more need for this option. It is now a widget already controlled by end user
-	print '<tr class="oddeven"><td>' . $langs->trans('BoxstatsDisableGlobal') . '</td><td>';
-	print ajax_constantonoff("MAIN_DISABLE_GLOBAL_BOXSTATS", array(), $conf->entity, 0, 0, 1, 0);
-	print '</td>';
-	print '</tr>';
-	*/
-
-	print '</table>';
-	print '</div>';
-
-	print '<br>';
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table summary="blockdashboard" class="noborder centpercent editmode tableforfield">';
-
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
-	print $langs->trans("DashboardDisableBlocks");
-	print '</td><td class="titlefieldmiddle">';
-	print '</td></tr>';
-
-	print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableGlobal') . '</td><td>';
-	print ajax_constantonoff("MAIN_DISABLE_GLOBAL_WORKBOARD", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-	print '</td>';
-	print '</tr>';
-
-	if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
-		// Block meteo
-		print '<tr class="oddeven"><td>' . $langs->trans('MAIN_DISABLE_METEO') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_METEO", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block agenda
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAgenda') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_AGENDA", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block agenda
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockProject') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_PROJECT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block customer
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockCustomer') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CUSTOMER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block supplier
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockSupplier') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_SUPPLIER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block contract
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockContract') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CONTRACT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block ticket
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockTicket') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_TICKET", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block bank
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockBank') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_BANK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block adherent
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAdherent') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_ADHERENT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block expense report
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockExpenseReport') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_EXPENSEREPORT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-
-		// Block holiday
-		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockHoliday') . '</td><td>';
-		print ajax_constantonoff("MAIN_DISABLE_BLOCK_HOLIDAY", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
-		print '</td>';
-		print '</tr>';
-	}
-
-	print '</table>' . "\n";
-	print '</div>';
-}
-
 if ($mode == 'other') {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
@@ -587,6 +463,133 @@ if ($mode == 'other') {
 	print '</div>';
 }
 
+
+if ($mode == 'template') {
+	// Themes and themes options
+	showSkins(null, 1);
+}
+
+
+if ($mode == 'dashboard') {
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="blockdashboard" class="noborder centpercent editmode tableforfield">';
+
+	// Message of the day on home page
+	$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'));
+	complete_substitutions_array($substitutionarray, $langs);
+
+	print '<tr class="oddeven width25p"><td>';
+	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>';
+	foreach ($substitutionarray as $key => $val) {
+		$texthelp .= $key . '<br>';
+	}
+	print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday');
+
+	print '</td><td>';
+
+	$doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD) ? $conf->global->MAIN_MOTD : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
+	$doleditor->Create();
+
+	print '</td></tr>' . "\n";
+
+	/* no more need for this option. It is now a widget already controlled by end user
+	 print '<tr class="oddeven"><td>' . $langs->trans('BoxstatsDisableGlobal') . '</td><td>';
+	 print ajax_constantonoff("MAIN_DISABLE_GLOBAL_BOXSTATS", array(), $conf->entity, 0, 0, 1, 0);
+	 print '</td>';
+	 print '</tr>';
+	 */
+
+	print '</table>';
+	print '</div>';
+
+	print '<br>';
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="blockdashboard" class="noborder centpercent editmode tableforfield">';
+
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
+	print $langs->trans("DashboardDisableBlocks");
+	print '</td><td class="titlefieldmiddle">';
+	print '</td></tr>';
+
+	print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableGlobal') . '</td><td>';
+	print ajax_constantonoff("MAIN_DISABLE_GLOBAL_WORKBOARD", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+	print '</td>';
+	print '</tr>';
+
+	if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
+		// Block meteo
+		print '<tr class="oddeven"><td>' . $langs->trans('MAIN_DISABLE_METEO') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_METEO", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block agenda
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAgenda') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_AGENDA", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block agenda
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockProject') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_PROJECT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block customer
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockCustomer') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CUSTOMER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block supplier
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockSupplier') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_SUPPLIER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block contract
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockContract') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CONTRACT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block ticket
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockTicket') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_TICKET", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block bank
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockBank') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_BANK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block adherent
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAdherent') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_ADHERENT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block expense report
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockExpenseReport') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_EXPENSEREPORT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block holiday
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockHoliday') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_HOLIDAY", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+	}
+
+	print '</table>' . "\n";
+	print '</div>';
+}
+
+
 if ($mode == 'login') {
 	// Other
 	print '<div class="div-table-responsive-no-min">';
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index ac3de08af10..8c4d958abac 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -637,6 +637,18 @@ function setConstant(url, code, input, entity, strict, forcereload, userid, toke
 					url = url + "?dol_resetcache=1";
 				}
 			}
+			var page_y = $(document).scrollTop();
+			url = url.replace(/page_y=\d+/g, '');
+			if (page_y > 0) {
+				if (url.indexOf('?') > -1) {
+					url = url + "&page_y="+page_y;
+				} else {
+					url = url + "?page_y="+page_y;
+				}
+			}
+			url = url.replace(/&&+/, '&');
+			console.log("url ro redirect = "+url);
+
 			window.location.href = url;
 			//location.reload();
 			return false;
@@ -718,6 +730,18 @@ function delConstant(url, code, input, entity, strict, forcereload, userid, toke
 					url = url + "?dol_resetcache=1";
 				}
 			}
+			var page_y = $(document).scrollTop();
+			url = url.replace(/page_y=\d+/g, '');
+			if (page_y > 0) {
+				if (url.indexOf('?') > -1) {
+					url = url + "&page_y="+page_y;
+				} else {
+					url = url + "?page_y="+page_y;
+				}
+			}
+			url = url.replace(/&&+/, '&');
+			console.log("url ro redirect = "+url);
+
 			window.location.href = url;
 			//location.reload();
 			return false;