diff --git a/app/main.css b/app/main.css
index bd277e91..f7326f11 100644
--- a/app/main.css
+++ b/app/main.css
@@ -67,6 +67,63 @@ progress::-webkit-progress-value {
   box-shadow: 0 0 5rem 5rem white;
 }
 
+.checkbox {
+  @apply leading-normal;
+  @apply select-none;
+}
+
+.checkbox > input[type='checkbox'] {
+  @apply absolute;
+  @apply opacity-0;
+}
+
+.checkbox > label {
+  @apply cursor-pointer;
+}
+
+.checkbox > label::before {
+  @apply bg-blue-lightest;
+  @apply border;
+  @apply rounded-sm;
+
+  content: '';
+  height: 1.5rem;
+  width: 1.5rem;
+  margin-right: 0.5rem;
+  float: left;
+}
+
+.checkbox > label:hover::before {
+  @apply border-blue;
+}
+
+.checkbox > input:focus + label::before {
+  @apply border-blue;
+}
+
+.checkbox > input:checked + label::before {
+  background-image: url('../assets/lock.svg');
+  background-position: center;
+  background-size: 1.25rem;
+  background-repeat: no-repeat;
+}
+
+.checkbox > input:disabled + label {
+  cursor: auto;
+}
+
+.checkbox > input:disabled + label::before {
+  background-image: url('../assets/lock.svg');
+  background-position: center;
+  background-size: 1.25rem;
+  background-repeat: no-repeat;
+  cursor: auto;
+}
+
+#password-msg::after {
+  content: '\200b';
+}
+
 @screen md {
   .main {
     @apply flex-1;
diff --git a/app/pasteManager.js b/app/pasteManager.js
index 33b180b4..cdde7a81 100644
--- a/app/pasteManager.js
+++ b/app/pasteManager.js
@@ -7,6 +7,7 @@ function getString(item) {
 export default function(state, emitter) {
   window.addEventListener('paste', async event => {
     if (state.route !== '/' || state.uploading) return;
+    if (event.target.type === 'password') return;
 
     const items = Array.from(event.clipboardData.items);
     const transferFiles = items.filter(item => item.kind === 'file');
diff --git a/app/ui/archiveList.js b/app/ui/archiveList.js
index bb7adfc7..6b3177bf 100644
--- a/app/ui/archiveList.js
+++ b/app/ui/archiveList.js
@@ -1,21 +1,7 @@
 const html = require('choo/html');
-const assets = require('../../common/assets');
 const { list } = require('../utils');
 const archiveTile = require('./archiveTile');
-
-function intro(state) {
-  return html`
-  <article class="flex flex-col items-center justify-center bg-white border border-grey-light p-2">
-    <p class="text-center">
-      <div class="font-semibold">${state.translate('uploadPageHeader')}</div>
-      <div class="italic">${state.translate('pageHeaderCredits')}</div>
-    </p>
-    <img src="${assets.get('illustration_download.svg')}"/>
-    <p class="m-4 max-w-sm text-sm font-light">${state.translate(
-      'uploadPageExplainer'
-    )}</p>
-  </article>`;
-}
+const intro = require('./intro');
 
 module.exports = function(state, emit) {
   const archives = state.storage.files.map(archive =>
diff --git a/app/ui/archiveTile.js b/app/ui/archiveTile.js
index d17b6851..8c9bcd7f 100644
--- a/app/ui/archiveTile.js
+++ b/app/ui/archiveTile.js
@@ -16,6 +16,81 @@ function expiryInfo(translate, archive) {
   );
 }
 
+function password(state) {
+  const MAX_LENGTH = 32;
+
+  return html`
+  <div class="my-2">
+    <div class="checkbox">
+      <input
+        id="add-password"
+        type="checkbox"
+        ${state.password ? 'checked' : ''}
+        autocomplete="off"
+        onchange=${togglePasswordInput}/>
+      <label for="add-password">
+        ${state.translate('addPasswordMessage')}
+      </label>
+    </div>
+    <input
+      id="password-input"
+      class="${
+        state.password ? '' : 'invisible'
+      } border rounded-sm focus:border-blue leading-normal mt-2"
+      autocomplete="off"
+      maxlength="${MAX_LENGTH}"
+      type="password"
+      oninput=${inputChanged}
+      onfocus=${focused}
+      placeholder="${state.translate('unlockInputPlaceholder')}"
+      value="${state.password || ''}"
+    >
+    <label
+      id="password-msg"
+      for="password-input"
+      class="block text-xs text-grey-darker mt-1"></label>
+  </div>`;
+
+  function togglePasswordInput(event) {
+    event.stopPropagation();
+    const checked = event.target.checked;
+    const input = document.getElementById('password-input');
+    if (checked) {
+      input.classList.remove('invisible');
+      input.focus();
+    } else {
+      input.classList.add('invisible');
+      input.value = '';
+      document.getElementById('password-msg').textContent = '';
+      state.password = null;
+    }
+  }
+
+  function inputChanged() {
+    const passwordInput = document.getElementById('password-input');
+    const pwdmsg = document.getElementById('password-msg');
+    const password = passwordInput.value;
+    const length = password.length;
+
+    if (length === MAX_LENGTH) {
+      pwdmsg.textContent = state.translate('maxPasswordLength', {
+        length: MAX_LENGTH
+      });
+    } else {
+      pwdmsg.textContent = '';
+    }
+    state.password = password;
+  }
+
+  function focused(event) {
+    event.preventDefault();
+    const el = document.getElementById('password-input');
+    if (el.placeholder !== state.translate('unlockInputPlaceholder')) {
+      el.placeholder = '';
+    }
+  }
+}
+
 function fileInfo(file, action) {
   return html`
     <article class="flex flex-row items-start p-3">
@@ -104,6 +179,7 @@ module.exports.wip = function(state, emit) {
       </label>
     </div>
     ${expiryOptions(state, emit)}
+    ${password(state, emit)}
     <button
       class="flex-none border rounded bg-blue text-white mt-2 py-2 px-6"
       title="${state.translate('uploadFilesButton')}"
diff --git a/app/ui/download.js b/app/ui/download.js
index bebd2b60..7a9f9607 100644
--- a/app/ui/download.js
+++ b/app/ui/download.js
@@ -95,7 +95,7 @@ module.exports = function(state, emit) {
     content = password(state, emit);
   }
   return html`
-  <main class="main">
+  <main class="main container">
     <section class="relative h-full w-full my-4 px-6">
       ${content}
     </section>
diff --git a/app/ui/intro.js b/app/ui/intro.js
new file mode 100644
index 00000000..cb546f0a
--- /dev/null
+++ b/app/ui/intro.js
@@ -0,0 +1,16 @@
+const html = require('choo/html');
+const assets = require('../../common/assets');
+
+module.exports = function intro(state) {
+  return html`
+  <article class="flex flex-col items-center justify-center bg-white border border-grey-light p-2">
+    <p class="text-center">
+      <div class="font-semibold">${state.translate('uploadPageHeader')}</div>
+      <div class="italic">${state.translate('pageHeaderCredits')}</div>
+    </p>
+    <img src="${assets.get('illustration_download.svg')}"/>
+    <p class="m-4 max-w-sm text-sm font-light">${state.translate(
+      'uploadPageExplainer'
+    )}</p>
+  </article>`;
+};
diff --git a/app/ui/selectbox.js b/app/ui/selectbox.js
index d90039af..2765c2ba 100644
--- a/app/ui/selectbox.js
+++ b/app/ui/selectbox.js
@@ -4,7 +4,7 @@ module.exports = function(selected, options, translate, changed) {
   let x = selected;
 
   return html`
-    <select class="appearance-none cursor-pointer border rounded-sm bg-blue-lightest p-1" onchange=${choose}>
+    <select class="appearance-none cursor-pointer border rounded-sm bg-blue-lightest hover:border-blue focus:border-blue p-1" onchange=${choose}>
       ${options.map(
         i =>
           html`<option value="${i}" ${