diff --git a/ChangeLog b/ChangeLog
index 41998fa..8c7ecb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ Version 3.2.2 (stable), ????-??-??
   -"Search for this"	// Excludes full phrase
 - Report admin, fixed filter editor issues when full phrase strings 
   (with spaces) were configured. 
+- Report admin, the custom filterstring was not saved if new report 
+  was created or the previous custom filterstring was empty. 
 ---------------------------------------------------------------------------
 Version 3.2.1 (stable), 2011-04-12
 - Fixed timezone parsing in GetEventTime function. This caused problems 
diff --git a/src/admin/reports.php b/src/admin/reports.php
index 1519912..a102ddd 100644
--- a/src/admin/reports.php
+++ b/src/admin/reports.php
@@ -589,11 +589,17 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
 	// Init Filterstring variable
 	$szFilterString = ""; 
 	
-	if (	strlen($content['filterString']) > 0 && 
-			!isset($_POST['subop']) && 
-			!isset($_POST['subop_edit']) && 
-			!isset($_POST['subop_delete']) && 
-			isset($_POST['report_filterString']) && $content['filterString'] != $_POST['report_filterString'] ) 
+	if (	
+			(	strlen($content['filterString']) <= 0 && 
+				isset($_POST['report_filterString']) )
+			||
+			(	strlen($content['filterString']) > 0 && 
+				!isset($_POST['subop']) && 
+				!isset($_POST['subop_edit']) && 
+				!isset($_POST['subop_delete']) && 
+				(	isset($_POST['report_filterString']) && $content['filterString'] != $_POST['report_filterString']	)
+			)
+		)
 	{
 		// Overwrite filterString from form data instead of filter array!
 		$content['filterString'] = DB_RemoveBadChars($_POST['report_filterString']);