diff --git a/edit-account-profile.php b/edit-account-profile.php
index d72cd7be..e37bd419 100755
--- a/edit-account-profile.php
+++ b/edit-account-profile.php
@@ -180,7 +180,7 @@
 	function onSubmitOfForm(/*HTMLFormElement*/ theForm){
 		try{
 			if(lValidateInput == "TRUE"){
-				var lUnsafeCharacters = /[`~!@#$%^&*()-_=+\[\]{}\\|;':",./<>?]/;
+				var lUnsafeCharacters = /[\W]/;
 				if (theForm.username.value.length > 15){
 						alert('Username too long. We dont want to allow too many characters.\n\nSomeone might have enough room to enter a hack attempt.');
 						return false;
diff --git a/includes/constants.php b/includes/constants.php
index 90c9ac34..a045ac2b 100755
--- a/includes/constants.php
+++ b/includes/constants.php
@@ -2,7 +2,7 @@
 	/* ------------------------------------------
 	 * @VERSION
 	 * ------------------------------------------*/
-	$C_VERSION = "2.11.7";
+	$C_VERSION = "2.11.8";
 	$C_VERSION_STRING = "Version: " . $C_VERSION;
 	$C_MAX_HINT_LEVEL = 1;
 
diff --git a/login.php b/login.php
index 1bf21ad2..4302fec2 100755
--- a/login.php
+++ b/login.php
@@ -46,7 +46,7 @@
 	function onSubmitOfLoginForm(/*HTMLFormElement*/ theForm){
 		try{
 			if(lValidateInput == "TRUE"){
-				var lUnsafeCharacters = /[`~!@#$%^&*()-_=+\[\]{}\\|;':",./<>?]/;
+				var lUnsafeCharacters = /[\W]/;
 				if (theForm.username.value.length > 15){
 						alert('Username too long. We dont want to allow too many characters.\n\nSomeone might have enough room to enter a hack attempt.');
 						return false;
diff --git a/register.php b/register.php
index 47c24eb5..76c0f769 100755
--- a/register.php
+++ b/register.php
@@ -113,7 +113,7 @@
 	function onSubmitOfForm(/*HTMLFormElement*/ theForm){
 		try{
 			if(lValidateInput == "TRUE"){
-				var lUnsafeCharacters = /[`~!@#$%^&*()-_=+\[\]{}\\|;':",./<>?]/;
+				var lUnsafeCharacters = /[\W]/;
 				if (theForm.username.value.length > 15 || 
 					theForm.password.value.length > 15){
 						alert('Username too long. We dont want to allow too many characters.\n\nSomeone might have enough room to enter a hack attempt.');
diff --git a/user-info-xpath.php b/user-info-xpath.php
index a06e237d..5e4516c9 100755
--- a/user-info-xpath.php
+++ b/user-info-xpath.php
@@ -76,7 +76,7 @@
 
 	function onSubmitOfForm(/*HTMLFormElement*/ theForm){
 		try{
-			var lUnsafeCharacters = /[`~!@#$%^&*()-_=+\[\]{}\\|;':",./<>?]/;
+			var lUnsafeCharacters = /[\W]/;
 
 			if(lValidateInput == "TRUE"){
 				if (theForm.username.value.length > 15){
diff --git a/user-info.php b/user-info.php
index 0eb7ac8d..ad219af2 100755
--- a/user-info.php
+++ b/user-info.php
@@ -62,7 +62,7 @@
 			
 	function onSubmitOfForm(/*HTMLFormElement*/ theForm){
 		try{
-			var lUnsafeCharacters = /[`~!@#$%^&*()-_=+\[\]{}\\|;':",./<>?]/;
+			var lUnsafeCharacters = /[\W]/;
 
 			if(lValidateInput == "TRUE"){
 				if (theForm.username.value.length > 15){