diff --git a/source/web/scripts/validation.js b/source/web/scripts/validation.js
index be31a382e1..1d3dc53a5b 100644
--- a/source/web/scripts/validation.js
+++ b/source/web/scripts/validation.js
@@ -126,12 +126,12 @@ function validateRegex(control, expression, requiresMatch, matchMessage, noMatch
 function validateName(control, message, showMessage)
 {
    var result = true;
-   var pattern = /[\"\*\\\>\<\?\/\:\|\%\&\+\;\xA3\xAC]+/;
+   var pattern = /([\"\*\\\>\<\?\/\:\|\xA3\xAC\%\&\+\;]+)|([ ]+$)|([\.]+$)/;
    
    var idx = control.value.search(pattern);
    if (idx != -1)
    {
-      informUser(control, control.value.charAt(idx) + " " + message, showMessage);
+      informUser(control, "'" + control.value.charAt(idx) + "' " + message, showMessage);
       result = false;
    }