diff --git a/include/layout.js b/include/layout.js
index 1e36f6ca03..c7a5b682c3 100644
--- a/include/layout.js
+++ b/include/layout.js
@@ -864,6 +864,7 @@ function saveGraphFilter(section) {
 	href=graphPage+'?action=save'+
 		'&columns='+$('#columns').val()+
 		'&graphs='+$('#graphs').val()+
+		'&thumbnails='+$('#thumbnails').is(':checked')+
 		'&predefined_timespan='+$('#predefined_timespan').val()+
 		'&predefined_timeshift='+$('#predefined_timeshift').val()+
 		'&thumbnails='+$('#thumbnails').is(':checked');
diff --git a/lib/html_graph.php b/lib/html_graph.php
index 93390ed93e..0ad764fc9d 100644
--- a/lib/html_graph.php
+++ b/lib/html_graph.php
@@ -96,26 +96,25 @@ function html_graph_validate_preview_request_vars() {
 		'thumbnails' => array(
 			'filter' => FILTER_VALIDATE_REGEXP, 
 			'options' => array('options' => array('regexp' => '(true|false)')),
-			'pageset' => true,
 			'default' => read_user_setting('thumbnail_section_preview') == 'on' ? 'true':'false'
 			),
 		'graph_list' => array(
 			'filter' => FILTER_VALIDATE_REGEXP, 
 			'options' => array('options' => array('regexp' => '/^([\,0-9]+)$/')),
 			'pageset' => true,
-			'default' => read_user_setting('thumbnail_section_preview') == 'on' ? 'true':'false'
+			'default' => ''
 			),
 		'graph_add' => array(
 			'filter' => FILTER_VALIDATE_REGEXP, 
 			'options' => array('options' => array('regexp' => '/^([\,0-9]+)$/')),
 			'pageset' => true,
-			'default' => read_user_setting('thumbnail_section_preview') == 'on' ? 'true':'false'
+			'default' => ''
 			),
 		'graph_remove' => array(
 			'filter' => FILTER_VALIDATE_REGEXP, 
 			'options' => array('options' => array('regexp' => '/^([\,0-9]+)$/')),
 			'pageset' => true,
-			'default' => read_user_setting('thumbnail_section_preview') == 'on' ? 'true':'false'
+			'default' => ''
 			),
 		'style' => array(
 			'filter' => FILTER_DEFAULT,
diff --git a/lib/html_tree.php b/lib/html_tree.php
index f1732b6edf..8087feecb5 100644
--- a/lib/html_tree.php
+++ b/lib/html_tree.php
@@ -484,7 +484,7 @@ function html_validate_tree_vars() {
 			'filter' => FILTER_VALIDATE_REGEXP, 
 			'options' => array('options' => array('regexp' => '(true|false)')),
 			'pageset' => true,
-			'default' => 'true'
+			'default' => read_user_setting('thumbnail_section_tree_2')
 			)
 	);