diff --git a/user.js b/user.js
index 3d104c88..01863a7b 100644
--- a/user.js
+++ b/user.js
@@ -38,7 +38,7 @@ User.prototype.initCallbacks = function() {
     }.bind(this));
 
     this.socket.on('joinChannel', function(data) {
-        if(!data.name.match(/[a-zA-Z0-9]+/))
+        if(!data.name.match(/^[a-zA-Z0-9]+$/))
             return;
         // Channel already loaded
         if(data.name in Server.channels) {
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index f80a011b..4e960f75 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -61,7 +61,7 @@ if(params['channel'] == undefined) {
         }
     });
 }
-else if(!params['channel'].match(/[a-zA-Z0-9]+/)) {
+else if(!params['channel'].match(/^[a-zA-Z0-9]+$/)) {
     $('<div/>').addClass('alert alert-error')
         .insertAfter($('.row')[0])[0]
         .innerHTML = "<h3>Invalid Channel Name</h3><p>Channel names must conain only numbers and letters</p>";