diff --git a/bin/lamassu-server b/bin/lamassu-server
index fac0cf23..84ea417a 100755
--- a/bin/lamassu-server
+++ b/bin/lamassu-server
@@ -21,9 +21,10 @@ if (!argv.http) {
     cert: fs.readFileSync(argv.cert)
   };
 
-  options.mock = argv.mock;
 }
 
+options.mock = argv.mock;
+
 var server = createServer(options);
 server.listen(port, function () {
   console.log('lamassu-server listening on port ' + port + ' ' + (argv.http ? '(http)' : '(https)'));
diff --git a/lib/app.js b/lib/app.js
index d41b2508..847ae3e4 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -84,10 +84,12 @@ module.exports = function (options) {
     };
   }
 
+  if (options.mock) logger.info('In mock mode');
+
   routes.init({
-    app: app, 
-    lamassuConfig: config, 
-    trader: trader, 
+    app: app,
+    lamassuConfig: config,
+    trader: trader,
     authMiddleware: authMiddleware,
     mock: options.mock
   });