diff --git a/lib/functions/output/function.makecheckbox.php b/lib/functions/output/function.makecheckbox.php
index f6e506fc..f58f59b9 100644
--- a/lib/functions/output/function.makecheckbox.php
+++ b/lib/functions/output/function.makecheckbox.php
@@ -38,6 +38,10 @@ function makecheckbox($name, $title, $value, $break = false, $selvalue = NULL, $
 	{
 		$checked = 'checked="checked"';
 	}
+	else if(isset($_SESSION['requestData'][$name]))
+	{
+		$checked = 'checked="checked"';
+	}
 	else
 	{
 		$checked = '';
diff --git a/lib/init.php b/lib/init.php
index f995285d..88d29892 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -429,6 +429,9 @@ elseif(isset($_GET['action']))
 else
 {
 	$action = '';
+	
+	// clear request data
+	unset($_SESSION['requestData']);
 }
 
 if(isset($_POST['page']))