diff --git a/bunti_server/src/main/webapp/index.jsp b/bunti_server/src/main/webapp/index.jsp
index 4ab3dd7..0af636a 100644
--- a/bunti_server/src/main/webapp/index.jsp
+++ b/bunti_server/src/main/webapp/index.jsp
@@ -21,8 +21,7 @@
         $(document).ready(
         	function() {
         		var Socket = "MozWebSocket" in window ? MozWebSocket : WebSocket;
-        		ws = new MozWebSocket("ws://localhost:8080/bunti_server/bunti");
-        		//ws = new MozWebSocket("ws://localhost:8080/grizzly-websockets-chat/chat");
+        		ws = new Socket("ws://" + window.location.hostname + ":" + window.location.port + "/bunti_server/bunti");
 
         		ws.onmessage = function (message) {
           			//$("#messages").append("<p>" + message.data + "</p>");