diff --git a/app.js b/app.js
index 9ddb8dd6e4..b7385c424e 100644
--- a/app.js
+++ b/app.js
@@ -18,7 +18,7 @@
 
 // Configuration setup
 nconf = require('nconf');
-nconf.argv();
+nconf.argv().env();
 
 var fs = require('fs'),
 	winston = require('winston'),
diff --git a/src/webserver.js b/src/webserver.js
index ad2a1d0bfc..789cfb4d6b 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -462,5 +462,5 @@ var express = require('express'),
 
 }(WebServer));
 
-server.listen(nconf.get('port'));
+server.listen(nconf.get('PORT') || nconf.get('port'));
 global.server = server;