diff --git a/lib/commands/setup.js b/lib/commands/setup.js
index dff9011a6..34e10a0df 100644
--- a/lib/commands/setup.js
+++ b/lib/commands/setup.js
@@ -109,7 +109,7 @@ class SetupCommand extends Command {
             }
         }];
 
-        if (!argv.local && os.platform() === 'linux') {
+        if (!argv.local && argv['setup-linux-user'] !== false && os.platform() === 'linux') {
             initialStages.push({
                 title: 'Setting up "ghost" system user',
                 task: linux.bind(this)