Index: branches/RC/core/units/categories/categories_item.php
===================================================================
diff -u -N -r11368 -r11501
--- branches/RC/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 11368)
+++ branches/RC/core/units/categories/categories_item.php	(.../categories_item.php)	(revision 11501)
@@ -68,7 +68,7 @@
 		function stripDisallowed($string)
 		{
 			$filenames_helper =& $this->Application->recallObject('FilenamesHelper');
-			/* @var $filenames_helper FilenamesHelper */
+			/* @var $filenames_helper kFilenamesHelper */
 
 			$string = $filenames_helper->replaceSequences($string);
 
@@ -77,12 +77,12 @@
 
 		function checkFilename()
 		{
-			// System templates allow any characters in filename, because they may and will contain "/"
-			if( !$this->GetDBField('AutomaticFilename') && !$this->GetDBField('IsSystem'))
-			{
-				$filename = $this->GetDBField('Filename');
-				$this->SetDBField('Filename', $this->stripDisallowed($filename) );
+			if ($this->GetDBField('AutomaticFilename')) {
+				return ;
 			}
+
+			$filename = $this->GetDBField('Filename');
+			$this->SetDBField('Filename', $this->stripDisallowed($filename));
 		}
 
 		function checkAutoFilename($filename)