diff --git a/web/client.js b/web/client.js
index 064b9f3..f12f196 100644
--- a/web/client.js
+++ b/web/client.js
@@ -58,13 +58,13 @@ window.setInterval(function() {
 
 function join(channel) {
 
-    //if (document.domain == 'uchats.herokuapp.com') {
+    if (document.domain == 'uchats.herokuapp.com') {
         ws = new WebSocket('wss://uchats.herokuapp.com/uchatsserver')
-    /*}
+    }
     else {
         // for local installs
         ws = new WebSocket('ws://' + location.hostname+":"+location.port + '/uchatsserver')
-    }*/
+    }
 
     var wasConnected = false
 
@@ -299,29 +299,18 @@ $('#footer').onclick = function() {
 $('#uploadimage').onchange = function() {
     file = this.files[0];
     reader  = new FileReader();
-    
+        
     reader.addEventListener("load", function () {
+        if(file.size > 49000)
+        {
+            pushMessage({nick:'!', text:'Image must be smaller than 49000 bytes'});
+            return ;
+        }
+        
         args = {};
         args.cmd = "chat";
         args.text = '<img src="'+reader.result+'">';
-        send(args);
-    }, false);
-     
-    if (file) {
-        reader.readAsDataURL(file);
-    } 
-}
-
-$('#uploadvideo').onchange = function() {
-    file = this.files[0];
-    reader  = new FileReader();
-    
-    reader.addEventListener("load", function () {
-        args = {};
-        args.cmd = "chat";
-        args.text =   '<video width="320" height="240" controls>'+
-                      '<source src="'+reader.result+'">'+
-                      '</video>';
+        args.nick = "me";
         send(args);
     }, false);
      
@@ -335,6 +324,12 @@ $('#uploadfile').onchange = function() {
     reader  = new FileReader();
     
     reader.addEventListener("load", function () {
+        if(file.size > 49000)
+        {
+            pushMessage({nick:'!', text:'File must be smaller than 49000 bytes'});
+            return;
+        }
+    
         args = {};
         args.cmd = "chat";
         args.text = '<a target="_blank" href="'+reader.result+'">File: '+file.name+'</a>';
diff --git a/web/images/video.png b/web/images/video.png
deleted file mode 100644
index a2e9d37..0000000
Binary files a/web/images/video.png and /dev/null differ
diff --git a/web/index.jsp b/web/index.jsp
index 01d326f..b7570eb 100644
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -16,7 +16,6 @@
       <footer id="footer">
          <div class="container">
             <span class="select-wrapper" style="background-image: url(images/image.png);"><input class="fotterbutton" type="file" id="uploadimage" value="Upload Image" accept="image/*"></span>
-            <span class="select-wrapper" style="background-image: url(images/video.png);"><input class="fotterbutton" type="file" id="uploadvideo" value="Upload Video" accept="video/*"></span>
             <span class="select-wrapper" style="background-image: url(images/file.png);"><input class="fotterbutton" type="file" id="uploadfile" value="Upload File"></span>
             <form id="chatform" class="messages"><textarea id="chatinput" type="text" autocomplete="off" autofocus></textarea></form>
          </div>