diff --git a/lib/core/engine.js b/lib/core/engine.js
index a0f711edc..ae5826642 100644
--- a/lib/core/engine.js
+++ b/lib/core/engine.js
@@ -138,8 +138,8 @@ Engine.prototype.webServerService = function(options) {
   this.logger.setStatus("Starting Server");
   var server = new Server({
     logger: this.logger,
-    host: options.serverHost || webServerConfig.host,
-    port: options.serverPor  || webServerConfig.port
+    host: options.host || webServerConfig.host,
+    port: options.port  || webServerConfig.port
   });
   server.start(function(){});
 };
diff --git a/lib/core/services.js b/lib/core/services.js
index af6d2953e..a04f672eb 100644
--- a/lib/core/services.js
+++ b/lib/core/services.js
@@ -93,8 +93,8 @@ ServicesMonitor.prototype.check = function() {
       });
     },
     function checkDevServer(result, callback) {
-      var host = self.config.webServerConfig.host || self.serverHost;
-      var port = self.config.webServerConfig.port || self.serverPort;
+      var host = self.serverHost || self.config.webServerConfig.host;
+      var port = self.serverPort || self.config.webServerConfig.port;
       self.logger.trace('checkDevServer');
       var devServer = 'Webserver (http://' + host + ':' + port + ')';
       devServer = (self.runWebserver) ? devServer.green : devServer.red;