diff --git a/dist/favicon.ico b/dist/favicon.ico
new file mode 100644
index 0000000..dbb1143
Binary files /dev/null and b/dist/favicon.ico differ
diff --git a/index.html b/index.html
index 8254933..c141210 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
   <title>LessPass</title>
   <meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <link rel="shortcut icon" href="dist/favicon.ico">
   <link rel="stylesheet" href="dist/lesspass.min.css">
   <style>
     div.center {
diff --git a/src/images/favicon.ico b/src/images/favicon.ico
new file mode 100644
index 0000000..dbb1143
Binary files /dev/null and b/src/images/favicon.ico differ
diff --git a/src/main.js b/src/main.js
index 6187f32..8a9164b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,5 @@
 import Vue from "vue";
+import "./images/favicon.ico";
 import LessPass from "./LessPass.vue";
 import { sync } from "vuex-router-sync";
 import store from "./store";
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 08d82e0..5017dce 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -56,7 +56,8 @@
       </div>
     </div>
     <div class="form-group mb-0">
-      <button type="button"
+      <button id="login__forgot-password-btn"
+              type="button"
               class="btn btn-link btn-sm p-0"
               v-on:click="$router.push({name: 'passwordReset'})">
         <small>{{$t('ForgotPassword', 'Forgot your password?')}}</small>
diff --git a/src/views/PasswordGenerator.vue b/src/views/PasswordGenerator.vue
index 708d5d1..106e6d7 100644
--- a/src/views/PasswordGenerator.vue
+++ b/src/views/PasswordGenerator.vue
@@ -235,7 +235,13 @@
         const site = this.$refs.site;
         const login = this.$refs.login;
         const masterPassword = this.$refs.masterPassword;
-        site.value ? (login.value ? masterPassword.$refs.passwordField.focus() : login.focus()) : site.focus();
+        if(site && !site.value){
+          site.focus()
+        }else if(login && !login.value){
+          login.focus()
+        }else if(masterPassword){
+          masterPassword.$refs.passwordField.focus()
+        }
       },
       copyPassword() {
         const copied = copy(this.passwordGenerated);
diff --git a/src/views/PasswordReset.vue b/src/views/PasswordReset.vue
index 57a84ee..ac87e9c 100644
--- a/src/views/PasswordReset.vue
+++ b/src/views/PasswordReset.vue
@@ -15,7 +15,8 @@
     </div>
     <div class="form-group row">
       <div class="col-12">
-        <button id="loginButton" class="btn"
+        <button id="password-reset__reset-password-btn"
+                class="btn"
                 v-bind:class="{ 'btn-warning': version===1, 'btn-primary': version===2 }">
           {{$t('Reset my password')}}
         </button>
@@ -25,7 +26,7 @@
 </template>
 <script type="text/ecmascript-6">
   import User from '../api/user';
-  import {mapActions, mapGetters} from 'vuex';
+  import {mapState, mapGetters} from 'vuex';
   import message from '../services/message';
 
   export default {
@@ -35,15 +36,23 @@
       };
     },
     computed: {
-      ...mapGetters(['version', 'baseURL'])
+      ...mapState(['baseURL']),
+      ...mapGetters(['version'])
     },
     methods: {
-      resetPassword(){
+      resetPassword() {
+        const baseURL = this.baseURL;
+        if (!baseURL) {
+          message.displayGenericError();
+          return;
+        }
+
         if (!this.email) {
           message.error(this.$t('EmailRequiredError', 'We need an email to find your account.'));
           return;
         }
-        User.resetPassword({email: this.email}, {baseURL: this.baseURL})
+
+        User.resetPassword({email: this.email}, {baseURL})
           .then(() => {
             const successMessage = this.$t('resetPasswordSuccess',
               'If the email address {email} is associated with a LessPass account, you will shortly receive an email from LessPass with instructions on how to reset your password.',
diff --git a/test/e2e/specs/canSavePasswordProfile.js b/test/e2e/specs/canSavePasswordProfile.js
index c79d1a6..30eec6a 100644
--- a/test/e2e/specs/canSavePasswordProfile.js
+++ b/test/e2e/specs/canSavePasswordProfile.js
@@ -10,6 +10,9 @@ module.exports = {
       .setValue("#passwordField", "test@lesspass.com")
       .waitForElementVisible("#encryptMasterPassword__btn")
       .click("#encryptMasterPassword__btn")
+      .waitForElementVisible("#fingerprint .fa-university")
+      .waitForElementVisible("#fingerprint .fa-btc")
+      .waitForElementVisible("#fingerprint .fa-subway")
       .waitForElementVisible("#signInButton")
       .click("#signInButton")
       .waitForElementVisible("#site")
diff --git a/test/e2e/specs/passwordReset.js b/test/e2e/specs/passwordReset.js
new file mode 100644
index 0000000..048f2f9
--- /dev/null
+++ b/test/e2e/specs/passwordReset.js
@@ -0,0 +1,26 @@
+var assert = require("assert");
+
+module.exports = {
+  "Password reset": function(browser) {
+    browser
+      .url(browser.launch_url)
+      .waitForElementVisible(".fa-sign-in")
+      .click(".fa-sign-in")
+      .waitForElementVisible("#login__forgot-password-btn")
+      .click("#login__forgot-password-btn")
+      .waitForElementVisible("#password-reset__reset-password-btn")
+      .click("#password-reset__reset-password-btn");
+
+    browser.getLog(function(logs) {
+      logs = logs.filter(function(log) {
+        return ["DEBUG", "INFO"].indexOf(log.level) === -1;
+      });
+      assert(
+        logs.length === 0,
+        "Console log error(s):\n" + JSON.stringify(logs, null, 2)
+      );
+    });
+
+    browser.end();
+  }
+};
diff --git a/webpack.config.js b/webpack.config.js
index 4875b85..457d020 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,7 +16,7 @@ module.exports = {
     rules: [
       {test: /\.vue$/, loader: 'vue-loader'},
       {test: /\.js$/, exclude: /node_modules\/(?!copy-text-to-clipboard)/, loader: "babel-loader"},
-      {test: /\.(png|jpg|jpeg|gif)$/, loader: 'file-loader?name=[name].[ext]'},
+      {test: /\.(png|jpg|jpeg|gif|ico)$/, loader: 'file-loader?name=[name].[ext]'},
       {
         test: /\.scss$/,
         loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader!sass-loader', publicPath: ''})