diff --git a/server/pm2.json b/pm2.json
similarity index 79%
rename from server/pm2.json
rename to pm2.json
index 1fc6c341..e42b4c5a 100644
--- a/server/pm2.json
+++ b/pm2.json
@@ -1,7 +1,7 @@
 {
   "apps" : [{
     "name"        : "zoff",
-    "script"      : "./app.js",
+    "script"      : "./server/app.js",
     "watch"       : true,
     "ignore_watch": ["node_modules", "public/assets/images/thumbnails"],
   }]
diff --git a/server/app.js b/server/app.js
index c7d45bcc..233d7325 100644
--- a/server/app.js
+++ b/server/app.js
@@ -4,10 +4,7 @@ var cluster = require('cluster'),
     //publicPath = path.join(__dirname, 'public'),
     http = require('http'),
     port = 8080,
-    num_processes = require('os').cpus().length,
-    express = require('express'),
-    vhost = require('vhost'),
-    app = express();
+    num_processes = require('os').cpus().length;
 
 publicPath = path.join(__dirname, 'public');
 pathThumbnails = __dirname;
@@ -72,41 +69,17 @@ function startSingle(clustered, redis_enabled) {
             cert: certificate,
             ca: ca
         };
-
         var https = require('https');
         server = https.Server(credentials, routingFunction);
     } catch(err){
         console.log("Starting without https (probably on localhost)");
         server = http.createServer(routingFunction);
-        //add = ",http://localhost:80*,http://localhost:8080*,localhost:8080*, localhost:8082*,http://zoff.dev:80*,http://zoff.dev:8080*,zoff.dev:8080*, zoff.dev:8082*";
     }
 
     if(clustered) {
-        app
-        .use( vhost('*', function(req, res) {
-            server.emit("request", req, res);
-        }) )
-        .use( vhost('remote.*', function(req, res) {
-            server.emit("request", req, res);
-        }) )
-        .use( vhost('admin.*', function(req, res) {
-            server.emit("request", req, res);
-        }) )
-        .listen(onListen);
-        //server.listen(onListen);
+        server.listen(onListen);
     } else {
-        app
-        .use( vhost('*', function(req, res) {
-            server.emit("request", req, res);
-        }) )
-        .use( vhost('remote.*', function(req, res) {
-            server.emit("request", req, res);
-        }) )
-        .use( vhost('admin.*', function(req, res) {
-            server.emit("request", req, res);
-        }) )
-        .listen(port, onListen);
-        //server.listen(port, onListen);
+        server.listen(port, onListen);
     }
 
     var socketIO = client.socketIO;
@@ -118,18 +91,14 @@ function startSingle(clustered, redis_enabled) {
         } catch(e) {
             console.log("No redis-server to connect to..");
         }
-        socketIO.listen(server);
-    } else {
-        socketIO.listen(server);
     }
-
+    socketIO.listen(server);
 
     process.on('message', function(message, connection) {
         if (message !== 'sticky-session:connection') {
             return;
         }
         server.emit('connection', connection);
-
         connection.resume();
     });
 }
diff --git a/server/apps/admin.js b/server/apps/admin.js
index ea2f3851..0c23ed75 100644
--- a/server/apps/admin.js
+++ b/server/apps/admin.js
@@ -24,7 +24,7 @@ var session = require('express-session');
 var api = require(pathThumbnails + '/routing/admin/api.js');
 
 var User = require(pathThumbnails + '/models/user.js');
-var url = 'mongodb://localhost/users';
+var url = 'mongodb://' + mongo_db_cred.host + '/' + mongo_db_cred.user;
 mongoose.connect(url);
 
 
diff --git a/server/config/mongo_config.example.js b/server/config/mongo_config.example.js
index 094d278a..dc93501f 100644
--- a/server/config/mongo_config.example.js
+++ b/server/config/mongo_config.example.js
@@ -1,6 +1,8 @@
 var mongo_config = {
     config: 'mydb',
-    secret: "secret",
+    secret: 'secret',
+    users: 'users',
+    host: 'localhost',
 };
 
 module.exports = mongo_config;
diff --git a/server/handlers/db.js b/server/handlers/db.js
index 81e2b5c2..8fe2479d 100644
--- a/server/handlers/db.js
+++ b/server/handlers/db.js
@@ -7,7 +7,7 @@ try {
     process.exit();
 }
 var mongojs = require('mongojs');
-var db = mongojs(mongo_config.config);
+var db = mongojs('mongodb://' + mongo_config.host + '/' + mongo_config.config);
 
 db.collection("chat_logs").createIndex({ "createdAt": 1 }, { expireAfterSeconds: 600 });
 
diff --git a/server/routing/client/router.js b/server/routing/client/router.js
index b3e71fb0..1503ef21 100644
--- a/server/routing/client/router.js
+++ b/server/routing/client/router.js
@@ -23,8 +23,6 @@ try {
     }
 }
 
-
-
 router.use(recaptcha.middleware.render, function(req, res, next) {
     next(); // make sure we go to the next routes and don't stop here
 });