diff --git a/CHANGELOG b/CHANGELOG
index 93cf081a3..dbec41e94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -349,7 +349,7 @@
   already (in menu task list and document list)
 - break long original file names on viewDocument page
 - fix potential XSS attack in many fields of settings
-- allow to edit original filename
+- allow to edit original filename, check filename for problematic chars
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.40
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index c032d6550..3cd399199 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -783,7 +783,7 @@ $(document).ready( function() {
 		} else {
 			print htmlspecialchars($latestContent->getOriginalFileName());
 		}
-		if(!$latestContent->checkOriginalFileName()) {
+		if($user->isAdmin() && !$latestContent->checkOriginalFileName()) {
 			echo " <i class=\"fa fa-exclamation-triangle\" title=\"".getMLText('problematic_filename')."\"></i> ";
 		}
 		print "</li>\n";