diff --git a/lib/html_filter.php b/lib/html_filter.php
index 1a814d83a8..f0c7d05e1a 100644
--- a/lib/html_filter.php
+++ b/lib/html_filter.php
@@ -591,12 +591,10 @@ private function create_filter() {
 
 								if (isset($field_array['refresh'])) {
 									print '<button type="button" class="ui-button ui-corner-all ui-widget" id="tsrefresh"' . ' title="' . __esc('Refresh Selected Timespan') . '"><span class="button-text">' . __esc('Refresh') . '</span></button>';
-								//	print '<input type="button" class="ui-button ui-corner-all ui-widget' . $class . '" id="tsrefresh" value="' . __esc('Refresh') . '" title="' . __esc('Refresh Selected Timespan') . '">';
 								}
 
 								if (isset($field_array['clear'])) {
-									print '<button type="button" class="ui-button ui-corner-all ui-widget" id="tsclear"' . ' title="' . __esc('Clear') . '"><span class="button-text">' . __esc('Clear Selected Timespan') . '</span></span></button>';
-								//	print '<input type="button" class="ui-button ui-corner-all ui-widget' . $class . '" id="tsclear" value="' . __esc('Clear') . '" title="' . __esc('Clear Selected Timespan') . '">';
+									print '<button type="button" class="ui-button ui-corner-all ui-widget" id="tsclear"' . ' title="' . __esc('Clear Selected Timespan') . '"><span class="button-text">' . __esc('Clear') . '</span></span></button>';
 								}
 
 								print '</span>';
diff --git a/lib/timespan_settings.php b/lib/timespan_settings.php
index 8c1efe453f..2a0cd53989 100644
--- a/lib/timespan_settings.php
+++ b/lib/timespan_settings.php
@@ -51,11 +51,24 @@ function initialize_timespan(&$timespan) {
 	if (isset_request_var('button_clear')) {
 		reset_timespan_settings();
 
-		$_SESSION['sess_current_timespan']  = read_user_setting('default_timespan');
-		$_SESSION['sess_current_timeshift'] = read_user_setting('default_timeshift');
+		$default_timespan  = read_user_setting('default_timespan');
+		$default_timeshift = read_user_setting('default_timeshift');
 
-		set_request_var('predefined_timespan', read_user_setting('default_timespan'));
-		set_request_var('predefined_timeshift', read_user_setting('default_timeshift'));
+		if (empty($detault_timespan)) {
+			$default_timespan = 7;
+			set_user_setting('predefined_timespan', $default_timespan);
+		}
+
+		if (empty($default_timeshift)) {
+			$default_timeshift = 7;
+			set_user_setting('predefined_timeshift', $default_timeshift);
+		}
+
+		$_SESSION['sess_current_timespan']  = $default_timespan;
+		$_SESSION['sess_current_timeshift'] = $default_timeshift;
+
+		set_request_var('predefined_timespan', $default_timespan);
+		set_request_var('predefined_timeshift', $default_timeshift);
 
 		return true;
 	}