diff --git a/public/src/forum/register.js b/public/src/forum/register.js
index 9f74698eba..7818025be0 100644
--- a/public/src/forum/register.js
+++ b/public/src/forum/register.js
@@ -22,12 +22,13 @@
 		if(username.value.length < 3) {
 			username_notify.innerHTML = 'Username too short';
 			username_notify.className = 'label label-important';
-		}
-		else if(!usernamevalid) {
+		} else if(username.value.length > 13) {
+			username_notify.innerHTML = 'Username too long';
+			username_notify.className = 'label label-important';
+		} else if(!usernamevalid) {
 			username_notify.innerHTML = 'Invalid username';
 			username_notify.className = 'label label-important';
-		}
-		else {
+		} else {
 			socket.emit('user.exists', {username: username.value});
 		}
 	});
diff --git a/public/src/utils.js b/public/src/utils.js
index 6f27bd7bce..c6465debbe 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -86,12 +86,12 @@
 		// from http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
 		isEmailValid: function(email) {
 			// var re = /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/;
-			var	valid = email.indexOf('@') !== -1 ? true : false;
+			var valid = email.indexOf('@') !== -1 ? true : false;
 			return valid;
 		},
 
 		isUserNameValid: function(name) {
-			return (name && name !== "" && !(/^\s*$/.test(name)));
+			return (name && name !== "" && (/^\w{3,14}$/.test(name)));
 		},
 	
 		isPasswordValid: function(password) {