diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 39ac0e218..a29bb9195 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1686,7 +1686,7 @@
     "description": "A toast message telling the user that the mnemonic was copied"
   },
 
-  "launcherViewTitle": {
+  "passwordViewTitle": {
     "message": "Type in your password",
     "description": "The title shown when user needs to type in a password to unlock the messenger"
   },
diff --git a/app/user_config.js b/app/user_config.js
index 44a0b1171..4da1f62a0 100644
--- a/app/user_config.js
+++ b/app/user_config.js
@@ -1,6 +1,6 @@
 const path = require('path');
 
-const app = require('electron').app || require('electron').remote.app;
+const { app } = require('electron');
 
 const { start } = require('./base_config');
 const config = require('./config');
diff --git a/js/launcher_start.js b/js/password_start.js
similarity index 61%
rename from js/launcher_start.js
rename to js/password_start.js
index 38ec1e9e5..eba6676d5 100644
--- a/js/launcher_start.js
+++ b/js/password_start.js
@@ -1,7 +1,7 @@
-/* global $, Whisper, storage */
+/* global $, Whisper */
 const $body = $(document.body);
 
 // eslint-disable-next-line strict
-window.view = new Whisper.LauncherView();
+window.view = new Whisper.PasswordView();
 $body.html('');
 window.view.$el.prependTo($body);
diff --git a/js/views/launcher_view.js b/js/views/password_view.js
similarity index 79%
rename from js/views/launcher_view.js
rename to js/views/password_view.js
index ab685f759..e32cfb5e1 100644
--- a/js/views/launcher_view.js
+++ b/js/views/password_view.js
@@ -9,9 +9,9 @@
 
   window.Whisper = window.Whisper || {};
 
-  Whisper.LauncherView = Whisper.View.extend({
-    className: 'launcher full-screen-flow standalone-fullscreen',
-    templateName: 'launcher',
+  Whisper.PasswordView = Whisper.View.extend({
+    className: 'password full-screen-flow standalone-fullscreen',
+    templateName: 'password',
     events: {
       'click #unlock-button': 'onLogin',
     },
@@ -20,7 +20,7 @@
     },
     render_attributes() {
       return {
-        title: i18n('launcherViewTitle'),
+        title: i18n('passwordViewTitle'),
         buttonText: i18n('unlock'),
       };
     },
diff --git a/main.js b/main.js
index c921d916c..a95b94a24 100644
--- a/main.js
+++ b/main.js
@@ -415,47 +415,37 @@ function setupAsStandalone() {
   }
 }
 
-let launcherWindow;
-function showLauncher() {
-  if (launcherWindow) {
-    launcherWindow.show();
+let passwordWindow;
+function showPasswordWindow() {
+  if (passwordWindow) {
+    passwordWindow.show();
     return;
   }
 
-  const windowOptions = Object.assign(
-    {
-      show: !startInTray, // allow to start minimised in tray
-      width: DEFAULT_WIDTH,
-      height: DEFAULT_HEIGHT,
-      minWidth: MIN_WIDTH,
-      minHeight: MIN_HEIGHT,
-      autoHideMenuBar: false,
-      webPreferences: {
-        nodeIntegration: false,
-        nodeIntegrationInWorker: false,
-        // sandbox: true,
-        preload: path.join(__dirname, 'launcher_preload.js'),
-        nativeWindowOpen: true,
-      },
-      icon: path.join(__dirname, 'images', 'icon_256.png'),
+  const windowOptions = {
+    show: true, // allow to start minimised in tray
+    width: DEFAULT_WIDTH,
+    height: DEFAULT_HEIGHT,
+    minWidth: MIN_WIDTH,
+    minHeight: MIN_HEIGHT,
+    autoHideMenuBar: false,
+    webPreferences: {
+      nodeIntegration: false,
+      nodeIntegrationInWorker: false,
+      // sandbox: true,
+      preload: path.join(__dirname, 'password_preload.js'),
+      nativeWindowOpen: true,
     },
-    _.pick(windowConfig, [
-      'maximized',
-      'autoHideMenuBar',
-      'width',
-      'height',
-      'x',
-      'y',
-    ])
-  );
+    icon: path.join(__dirname, 'images', 'icon_256.png'),
+  };
 
-  launcherWindow = new BrowserWindow(windowOptions);
+  passwordWindow = new BrowserWindow(windowOptions);
 
-  launcherWindow.loadURL(prepareURL([__dirname, 'launcher.html']));
+  passwordWindow.loadURL(prepareURL([__dirname, 'password.html']));
 
-  captureClicks(launcherWindow);
+  captureClicks(passwordWindow);
 
-  launcherWindow.on('close', e => {
+  passwordWindow.on('close', e => {
      // If the application is terminating, just do the default
      if (
       config.environment === 'test' ||
@@ -467,7 +457,7 @@ function showLauncher() {
 
     // Prevent the shutdown
     e.preventDefault();
-    launcherWindow.hide();
+    passwordWindow.hide();
 
     // On Mac, or on other platforms when the tray icon is in use, the window
     // should be only hidden, not closed, when the user clicks the close button
@@ -483,16 +473,12 @@ function showLauncher() {
       return;
     }
 
-    launcherWindow.readyForShutdown = true;
+    passwordWindow.readyForShutdown = true;
     app.quit();
   });
 
-  launcherWindow.on('closed', () => {
-    launcherWindow = null;
-  });
-
-  launcherWindow.once('ready-to-show', () => {
-    launcherWindow.show();
+  passwordWindow.on('closed', () => {
+    passwordWindow = null;
   });
 }
 
@@ -723,11 +709,11 @@ app.on('ready', async () => {
 
   const key = getDefaultSQLKey();
 
-  // If we have a password set then show the launcher
+  // If we have a password set then show the password window
   // Otherwise show the main window
   const passHash = userConfig.get('passHash');
   if (passHash) {
-    showLauncher();
+    showPasswordWindow();
   } else {
     await showMainWindow(key);
   }
@@ -962,9 +948,9 @@ ipc.on('update-tray-icon', (event, unreadCount) => {
   }
 });
 
-// Launch screen related IPC calls
-ipc.on('launcher-login', async (event, passPhrase) => {
-  const sendError = (e) => event.sender.send('launcher-login-response', e);
+// Password screen related IPC calls
+ipc.on('password-window-login', async (event, passPhrase) => {
+  const sendError = (e) => event.sender.send('password-window-login-response', e);
 
   // Check if the phrase matches with the hash we have stored
   const hash = userConfig.get('passHash');
@@ -978,9 +964,9 @@ ipc.on('launcher-login', async (event, passPhrase) => {
   const key = hash ? passPhrase : getDefaultSQLKey();
   try {
     await showMainWindow(key);
-    if (launcherWindow) {
-      launcherWindow.close();
-      launcherWindow = null;
+    if (passwordWindow) {
+      passwordWindow.close();
+      passwordWindow = null;
     }
   } catch (e) {
     sendError('Failed to decrypt SQL database');
diff --git a/package.json b/package.json
index b37c2b068..fe307b1ee 100644
--- a/package.json
+++ b/package.json
@@ -224,7 +224,7 @@
       "background.html",
       "about.html",
       "settings.html",
-      "launcher.html",
+      "password.html",
       "permissions_popup.html",
       "debug_log.html",
       "_locales/**",
diff --git a/launcher.html b/password.html
similarity index 89%
rename from launcher.html
rename to password.html
index 6f77193c3..557c74b7e 100644
--- a/launcher.html
+++ b/password.html
@@ -16,7 +16,7 @@
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
   <style>
   </style>
-  <script type='text/x-tmpl-mustache' id='launcher'>
+  <script type='text/x-tmpl-mustache' id='password'>
     <div class='content-wrapper standalone'>
       <div class='content'>
         <h2>{{ title }}</h2>
@@ -31,7 +31,7 @@
 
   <script type='text/javascript' src='js/components.js'></script>
   <script type='text/javascript' src='js/views/whisper_view.js'></script>
-  <script type='text/javascript' src='js/views/launcher_view.js'></script>
+  <script type='text/javascript' src='js/views/password_view.js'></script>
 </head>
 <body>
   <div class='app-loading-screen'>
@@ -45,6 +45,6 @@
         <div class='message'></div>
       </div>
     </div>
-    <script type='text/javascript' src='js/launcher_start.js'></script>
+    <script type='text/javascript' src='js/password_start.js'></script>
 </body>
 </html>
diff --git a/launcher_preload.js b/password_preload.js
similarity index 75%
rename from launcher_preload.js
rename to password_preload.js
index 3c50a6796..f8dcb3eb3 100644
--- a/launcher_preload.js
+++ b/password_preload.js
@@ -4,9 +4,6 @@ const { ipcRenderer } = require('electron');
 const url = require('url');
 const i18n = require('./js/modules/i18n');
 
-const passwordUtil = require('./app/password_util');
-const userConfig = require('./app/user_config');
-
 const config = url.parse(window.location.toString(), true).query;
 const { locale } = config;
 const localeMessages = ipcRenderer.sendSync('locale-data');
@@ -23,20 +20,18 @@ window.Signal = Signal.setup({
   getRegionCode: () => null,
 });
 
-window.passwordUtil = passwordUtil;
-window.userConfig = userConfig;
 window.getEnvironment = () => config.environment;
 window.getVersion = () => config.version;
 window.getAppInstance = () => config.appInstance;
 
 window.onLogin = (passPhrase) => new Promise((resolve, reject) => {
-  ipcRenderer.once('launcher-login-response', (event, error) => {
+  ipcRenderer.once('password-window-login-response', (event, error) => {
     if (error) {
       return reject(error);
     }
     return resolve();
   });
-  ipcRenderer.send('launcher-login', passPhrase);
+  ipcRenderer.send('password-window-login', passPhrase);
 });
 
 require('./js/logging');
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 972f78f41..b61fbf51c 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -637,9 +637,12 @@ textarea {
     width: 100%;
   }
   .step {
-    height: 100%;
-    width: 100%;
-    padding: 70px 0 50px;
+    display: flex;
+    align-items: center;
+    min-width: 100%;
+    min-height: 100%;
+    margin: auto;
+    padding: 10px 0;
   }
   .step-body {
     margin-left: auto;
@@ -653,6 +656,7 @@ textarea {
     justify-content: center;
     flex-direction: column;
     height: 100%;
+    width: 100%;
   }
 
   .banner-image {
diff --git a/stylesheets/_launcher.scss b/stylesheets/_password.scss
similarity index 96%
rename from stylesheets/_launcher.scss
rename to stylesheets/_password.scss
index 7dac09b02..23c7dd372 100644
--- a/stylesheets/_launcher.scss
+++ b/stylesheets/_password.scss
@@ -1,4 +1,4 @@
-.launcher {
+.password {
   .content-wrapper {
     display: flex;
     align-items: center;
@@ -26,4 +26,4 @@
     font-size: 16px;
     margin-top: 1em;
   }
-}
+}
\ No newline at end of file
diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss
index 3c7274e5c..b5c70eece 100644
--- a/stylesheets/manifest.scss
+++ b/stylesheets/manifest.scss
@@ -11,7 +11,7 @@
 @import 'recorder';
 @import 'emoji';
 @import 'settings';
-@import 'launcher';
+@import 'password';
 
 // Build the main view
 @import 'index';