diff --git a/stylesheets/_password.scss b/stylesheets/_password.scss
deleted file mode 100644
index 46a9f0dd0..000000000
--- a/stylesheets/_password.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-.password {
-  .content-wrapper {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: $color-dark-05;
-    width: 100%;
-    height: 100%;
-  }
-
-  .content {
-    margin: 3em;
-  }
-
-  .inputs {
-    display: flex;
-    flex-direction: column;
-  }
-
-  input {
-    width: 30em;
-  }
-
-  .error {
-    font-weight: bold;
-    font-size: 16px;
-    margin-top: 1em;
-  }
-
-  .reset {
-    font-size: 15px;
-    margin-top: 1em;
-    cursor: pointer;
-    user-select: none;
-
-    a {
-      color: #78be20;
-      font-weight: bold;
-    }
-  }
-
-  .overlay {
-    color: $color-dark-05;
-    background: $color-dark-85;
-
-    .step {
-      padding: 0;
-    }
-  }
-}
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index f17490060..a70be1e63 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -1642,92 +1642,6 @@ input {
   }
 }
 
-.clear-data,
-.password-prompt {
-  &-wrapper {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    background-color: $session-color-black;
-
-    width: 100%;
-    height: 100%;
-
-    padding: 3 * $session-margin-lg;
-  }
-
-  &-error-section {
-    width: 100%;
-    color: $session-color-white;
-    margin: -$session-margin-sm 0px 2 * $session-margin-lg 0px;
-
-    .session-label {
-      &.primary {
-        background-color: rgba($session-color-primary, 0.3);
-      }
-      padding: $session-margin-xs $session-margin-sm;
-      font-size: $session-font-xs;
-      text-align: center;
-    }
-  }
-
-  &-container {
-    font-family: 'SF Pro Text';
-    color: $session-color-white;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    width: 600px;
-    min-width: 420px;
-    padding: 3 * $session-margin-lg 2 * $session-margin-lg;
-    box-sizing: border-box;
-    background-color: $session-shade-4;
-    border: 1px solid $session-shade-8;
-    border-radius: 2px;
-
-    .warning-info-area,
-    .password-info-area {
-      display: inline-flex;
-      justify-content: center;
-      align-items: center;
-
-      h1 {
-        color: $session-color-white;
-      }
-      svg {
-        margin-right: $session-margin-lg;
-      }
-    }
-
-    p,
-    input {
-      margin: $session-margin-lg 0px;
-    }
-
-    .button-group {
-      display: inline-flex;
-    }
-
-    #password-prompt-input {
-      width: 100%;
-      color: #fff;
-      background-color: #2e2e2e;
-      margin-top: 2 * $session-margin-lg;
-      padding: $session-margin-xs $session-margin-lg;
-      outline: none;
-      border: none;
-      border-radius: 2px;
-      text-align: center;
-      font-size: 24px;
-      letter-spacing: 5px;
-      font-family: 'SF Pro Text';
-    }
-  }
-}
-
 .onboarding-message-section {
   display: flex;
   flex-grow: 1;
diff --git a/stylesheets/_session_password.scss b/stylesheets/_session_password.scss
new file mode 100644
index 000000000..ecd391bb8
--- /dev/null
+++ b/stylesheets/_session_password.scss
@@ -0,0 +1,88 @@
+.password {
+  height: 100vh;
+  
+  .clear-data, .password-prompt {
+    &-wrapper {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      background-color: $session-color-black;
+
+      width: 100%;
+      height: 100%;
+
+      padding: 3 * $session-margin-lg;
+    }
+
+    &-error-section {
+      width: 100%;
+      color: $session-color-white;
+      margin: -$session-margin-sm 0px 2 * $session-margin-lg 0px;
+
+      .session-label {
+        &.primary {
+          background-color: rgba($session-color-primary, 0.3);
+        }
+        padding: $session-margin-xs $session-margin-sm;
+        font-size: $session-font-xs;
+        text-align: center;
+      }
+    }
+
+    &-container {
+      font-family: 'SF Pro Text';
+      color: $session-color-white;
+      display: inline-flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      width: 600px;
+      min-width: 420px;
+      padding: 3 * $session-margin-lg 2 * $session-margin-lg;
+      box-sizing: border-box;
+      background-color: $session-shade-4;
+      border: 1px solid $session-shade-8;
+      border-radius: 2px;
+
+      .warning-info-area,
+      .password-info-area {
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+
+        h1 {
+          color: $session-color-white;
+        }
+        svg {
+          margin-right: $session-margin-lg;
+        }
+      }
+
+      p,
+      input {
+        margin: $session-margin-lg 0px;
+      }
+
+      .button-group {
+        display: inline-flex;
+      }
+
+      #password-prompt-input {
+        width: 100%;
+        color: #fff;
+        background-color: #2e2e2e;
+        margin-top: 2 * $session-margin-lg;
+        padding: $session-margin-xs $session-margin-lg;
+        outline: none;
+        border: none;
+        border-radius: 2px;
+        text-align: center;
+        font-size: 24px;
+        letter-spacing: 5px;
+        font-family: 'SF Pro Text';
+      }
+    }
+  }
+}
diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss
index d4657b295..4961f65a3 100644
--- a/stylesheets/manifest.scss
+++ b/stylesheets/manifest.scss
@@ -12,7 +12,6 @@
 @import 'emoji';
 @import 'mentions';
 @import 'settings';
-@import 'password';
 
 // Build the main view
 @import 'index';
@@ -22,10 +21,16 @@
 @import 'ios';
 @import 'theme_dark';
 
-// Session
+// /////////////////// //
+// ///// Session ///// //
+// /////////////////// //
 @import 'modules';
 @import 'session';
+
+// Separate screens
 @import 'session_signin';
+@import 'session_password';
+
 @import 'session_theme';
 @import 'session_left_pane';
 @import 'session_group_panel';