diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 2dcfd5f10f..2bc5e24eb3 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -113,7 +113,7 @@
       }
 	</style>
 	<script>
-	var socket = io.connect('http://198.199.80.41:8081');
+	var socket = io.connect('http://198.58.101.18:8081');
 
 	socket.on('event:connect', function(data) {
 		
diff --git a/src/webserver.js b/src/webserver.js
index 371f5acc70..674fd98a29 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -1,11 +1,11 @@
 var express = require('express'),
+	WebServer = express(),
+	server = require('http').createServer(WebServer),
     connect = require('connect'),
-    config = require('../config.js'),
-    WebServer = express();
+    config = require('../config.js');
 
 (function(app) {
 	var templates = global.templates;
-	global.app = app;
 
 	app.get('/test', function(req, res) {
 		var body = 'testing';
@@ -39,8 +39,8 @@ var express = require('express'),
 			app.use(express.static(global.configuration.ROOT_DIRECTORY + '/public')); 
 			app.set('mailOptions', config.mailer);
 		});
-		
-		app.listen(config.port);
 	}
 
 }(WebServer));
+
+server.listen(config.port);