diff --git a/app/static/provider-lightsail.vue b/app/static/provider-lightsail.vue
new file mode 100644
index 0000000..b0fd906
--- /dev/null
+++ b/app/static/provider-lightsail.vue
@@ -0,0 +1,57 @@
+<template>
+  <div>
+    <div class="form-group">
+      <label>
+          Enter your AWS Access Key <a href="http://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html" title="http://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html" target="_blank" rel="noreferrer noopener" class="badge bagde-pill badge-primary">?</a>
+        <br>
+          Note: Make sure to use an IAM user with an acceptable policy attached (see <a
+              href="https://github.com/trailofbits/algo/blob/master/docs/deploy-from-ansible.md" target="_blank" rel="noreferrer noopener" >docs</a>)
+      </label>
+      <input
+          type="text"
+          class="form-control"
+          name="aws_access_key"
+          v-model="aws_access_key"
+      />
+    </div>
+    <div class="form-group">
+      <label>Enter your AWS Secret Key <a
+              href="http://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html" title="http://docs.aws.amazon.com/general/latest/gr/managing-aws-access-keys.html" target="_blank" rel="noreferrer noopener" class="badge bagde-pill badge-primary">?</a></label>
+      <input
+              type="password"
+              class="form-control"
+              name="aws_secret_key"
+              v-model="aws_secret_key">
+    </div>
+    <button class="btn btn-primary"
+            type="button"
+            v-on:click="submit"
+            v-bind:disabled="!is_valid">
+      Next
+    </button>
+  </div>
+</template>
+
+<script>
+module.exports = {
+  data: function() {
+    return {
+      aws_access_key: null,
+      aws_secret_key: null
+    };
+  },
+  computed: {
+    is_valid() {
+      return this.aws_access_key && this.aws_secret_key;
+    }
+  },
+  methods: {
+    submit() {
+      this.$emit('submit', {
+        aws_access_key: this.aws_access_key,
+        aws_secret_key: this.aws_secret_key
+      });
+    }
+  }
+};
+</script>
diff --git a/app/static/provider-setup.vue b/app/static/provider-setup.vue
index 6a2394f..3a28cb6 100644
--- a/app/static/provider-setup.vue
+++ b/app/static/provider-setup.vue
@@ -57,7 +57,8 @@ module.exports = {
     }
   },
   components: {
-    'digitalocean': window.httpVueLoader('/static/provider-do.vue')
+    'digitalocean': window.httpVueLoader('/static/provider-do.vue'),
+    'lightsail': window.httpVueLoader('/static/provider-lightsail.vue')
   }
 };
 </script>
diff --git a/app/static/status-done.vue b/app/static/status-done.vue
index 5391163..fba4f9c 100644
--- a/app/static/status-done.vue
+++ b/app/static/status-done.vue
@@ -4,7 +4,7 @@
       <p>Config files and certificates are in the ./configs/ directory.</p>
       <p>Go to <a href="https://whoer.net/" target="_blank" rel="noopener noopener">https://whoer.net/</a>
         after connecting and ensure that all your traffic passes through the VPN.</p>
-      <p>Local DNS resolver {{result.local_service_ip}}</p>
+      <p v-if="result.local_service_ip">Local DNS resolver {{result.local_service_ip}}</p>
       <p v-if="result.p12_export_password">The p12 and SSH keys password for new users is <code>{{result.p12_export_password}}</code></p>
       <p v-if="result.CA_password">The CA key password is <code>{{result.CA_password}}</code></p>
       <p v-if="result.ssh_access">Shell access: <code>ssh -F configs/{{result.ansible_ssh_host}}/ssh_config {{config.server_name}}</code></p>