diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4a7c788d30..761b2ae717 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1584,7 +1584,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         // Do not show login dialog if requested not to on the command line
         QString hifiNoLoginCommandLineKey = QString("--").append(HIFI_NO_LOGIN_COMMAND_LINE_KEY);
         int index = arguments().indexOf(hifiNoLoginCommandLineKey);
-        if (index != -1) {
+        if (index != -1 || _disableLoginScreen) {
             resumeAfterLoginDialogActionTaken();
             return;
         }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 3d4e6873a8..f42696cda0 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -733,6 +733,7 @@ private:
     GraphicsEngine _graphicsEngine;
     void updateRenderArgs(float deltaTime);
 
+    bool _disableLoginScreen { true };
 
     Overlays _overlays;
     ApplicationOverlay _applicationOverlay;