diff --git a/packages/master/master.js b/packages/master/master.js
index 39214a98..59bd8317 100755
--- a/packages/master/master.js
+++ b/packages/master/master.js
@@ -38,6 +38,7 @@ const libLoggingUtils = require("@clusterio/lib/logging_utils");
 
 const Master = require("./src/Master");
 const UserManager = require("./src/UserManager");
+const version = require("./package").version;
 
 // globals
 let master;
@@ -284,6 +285,12 @@ async function initialize() {
 		}));
 	}
 
+	let command = parameters.args._[0];
+	if (command === "run") {
+		logger.info(`Starting Clusterio master ${version}`);
+		parameters.shouldRun = true;
+	}
+
 	logger.info(`Loading available plugins from ${parameters.args.pluginList}`);
 	let pluginList = new Map();
 	try {
@@ -295,7 +302,6 @@ async function initialize() {
 	}
 
 	// If the command is plugin management we don't try to load plugins
-	let command = parameters.args._[0];
 	if (command === "plugin") {
 		await libSharedCommands.handlePluginCommand(parameters.args, pluginList, parameters.args.pluginList);
 		return parameters;
@@ -336,15 +342,11 @@ async function initialize() {
 		await libSharedCommands.handleConfigCommand(
 			parameters.args, parameters.masterConfig, parameters.masterConfigPath
 		);
-		return parameters;
 
 	} else if (command === "bootstrap") {
 		await handleBootstrapCommand(parameters.args, parameters.masterConfig);
-		return parameters;
 	}
 
-	// If we get here the command was run
-	parameters.shouldRun = true;
 	return parameters;
 }
 
diff --git a/packages/slave/slave.js b/packages/slave/slave.js
index 8f9f70e7..f58c4c31 100755
--- a/packages/slave/slave.js
+++ b/packages/slave/slave.js
@@ -129,6 +129,11 @@ async function startSlave() {
 		}));
 	}
 
+	let command = args._[0];
+	if (command === "run") {
+		logger.info(`Starting Clusterio slave ${version}`);
+	}
+
 	// add better stack traces on promise rejection
 	process.on("unhandledRejection", err => logger.error(`Unhandled rejection:\n${err.stack}`));
 
@@ -143,7 +148,6 @@ async function startSlave() {
 	}
 
 	// If the command is plugin management we don't try to load plugins
-	let command = args._[0];
 	if (command === "plugin") {
 		await libSharedCommands.handlePluginCommand(args, pluginList, args.pluginList);
 		return;