diff --git a/.vscode/launch.json b/.vscode/launch.json
index 579967e2..007f1cff 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,6 +1,26 @@
 {
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "dev",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron",
+      "windows": {
+        "runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
+      },
+      "args": ["."],
+      "env": {
+        "ELECTRON_DEBUGGING": "true",
+        "ELECTRON_DEV": "true"
+      },
+      "outputCapture": "std",
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceFolder}/lib/**/*.js"
+      ]
+    },
     {
       "name": "corp",
       "type": "node",
@@ -22,7 +42,27 @@
       ]
     },
     {
-      "name": "corp",
+      "name": "mana",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron",
+      "windows": {
+        "runtimeExecutable": "${workspaceFolder}/node_modules/electron/dist/Electron.exe"
+      },
+      "args": [".", "--url=https://local-dev.symphony.com:9090"],
+      "env": {
+        "ELECTRON_DEBUGGING": "true",
+        "ELECTRON_DEV": "true"
+      },
+      "outputCapture": "std",
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceFolder}/lib/**/*.js"
+      ]
+    }
+    {
+      "name": "demo",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
index ba27fa62..8c9bbdd4 100644
--- a/src/app/window-handler.ts
+++ b/src/app/window-handler.ts
@@ -181,7 +181,7 @@ export class WindowHandler {
         this.url = WindowHandler.getValidUrl(this.userConfig.url ? this.userConfig.url : this.globalConfig.url);
         logger.info(`window-handler: setting url ${this.url} from config file!`);
 
-        if (config.isFirstTimeLaunch()) {
+        if (config.isFirstTimeLaunch() && this.globalConfig.url.indexOf('https://my.symphony.com') >= 0) {
             this.shouldShowWelcomeScreen = true;
             this.url = this.defaultPodUrl;
             isMaximized = false;