diff --git a/public/desktop.js b/public/desktop.js
index 45ff10f..ffea006 100644
--- a/public/desktop.js
+++ b/public/desktop.js
@@ -20,12 +20,11 @@ function createWindow() {
         }
     );
     
-    mainWindow.loadURL(`file://${path.join(__dirname, '../build/index.html')}`);
+    mainWindow.loadURL(`file://${path.join(__dirname, '../build/index.html#/')}`);
 
     mainWindow.on('closed', () => {
         mainWindow = null
     });
-
 }
 
 function createMenubar() {
diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx
index 3e9d155..aa20a2c 100644
--- a/src/pages/Welcome.tsx
+++ b/src/pages/Welcome.tsx
@@ -214,7 +214,7 @@ class WelcomePage extends Component<IWelcomeProps, IWelcomeState> {
     }
 
     authorizeEmergencyLogin() {
-        window.location.href = `/?code=${this.state.authCode}#/`;
+        window.location.href = `${this.state.defaultRedirectAddress}/?code=${this.state.authCode}#/`;
     }
 
     resumeLogin() {