diff --git a/src/components/MasterPassword.vue b/src/components/MasterPassword.vue
new file mode 100644
index 0000000..6ae8154
--- /dev/null
+++ b/src/components/MasterPassword.vue
@@ -0,0 +1,50 @@
+<template>
+    <div id="masterPassword" class="inner-addon left-addon input-group">
+        <label for="password" class="sr-only">Master Password</label>
+        <i class="fa fa-lock"></i>
+        <input id="password"
+               name="password"
+               ref="password"
+               type="password"
+               class="form-control"
+               placeholder="Master password"
+               autocomplete="new-password"
+               autocorrect="off"
+               autocapitalize="off"
+               v-on:input="updatePassword($event.target.value)">
+        <fingerprint v-bind:fingerprint="fingerprint" v-on:click.native="togglePasswordType($refs.password)">
+        </fingerprint>
+    </div>
+</template>
+<script type="text/ecmascript-6">
+    import debounce from 'lodash.debounce';
+    import Fingerprint from './Fingerprint.vue';
+
+    export default {
+        components: {
+            Fingerprint,
+        },
+        props: ['value'],
+        data(){
+            return {
+                fingerprint: ''
+            }
+        },
+        methods: {
+            updatePassword: function (password) {
+                this.showRealFingerprint(password);
+                this.$emit('input', password)
+            },
+            showRealFingerprint: debounce(function (password) {
+                this.fingerprint = password;
+            }, 1000),
+            togglePasswordType(element){
+                if (element.type === 'password') {
+                    element.type = 'text';
+                } else {
+                    element.type = 'password';
+                }
+            }
+        }
+    }
+</script>
diff --git a/src/views/PasswordGenerator.vue b/src/views/PasswordGenerator.vue
index 4a56962..2e4d07b 100644
--- a/src/views/PasswordGenerator.vue
+++ b/src/views/PasswordGenerator.vue
@@ -71,22 +71,7 @@
             </div>
         </div>
         <div class="form-group">
-            <div class="inner-addon left-addon input-group">
-                <label for="masterPassword" class="sr-only">Master Password</label>
-                <i class="fa fa-lock"></i>
-                <input id="masterPassword"
-                       name="masterPassword"
-                       ref="masterPassword"
-                       type="password"
-                       class="form-control"
-                       placeholder="Master password"
-                       autocomplete="new-password"
-                       autocorrect="off"
-                       autocapitalize="off"
-                       v-model="masterPassword">
-                <fingerprint :fingerprint="fingerprint" v-on:click.native="togglePasswordType($refs.masterPassword)">
-                </fingerprint>
-            </div>
+            <master-password v-model="masterPassword"></master-password>
         </div>
         <div class="form-group row">
             <div class="col-xs-9" v-show="generatedPassword">
@@ -207,12 +192,11 @@
     import LessPass from 'lesspass';
     import {mapGetters} from 'vuex';
     import Clipboard from 'clipboard';
-    import debounce from 'lodash.debounce';
     import {showTooltip} from '../api/tooltip';
     import Password from '../domain/password';
     import {getSite} from '../domain/url-parser';
     import RemoveAutoComplete from '../components/RemoveAutoComplete.vue';
-    import Fingerprint from '../components/Fingerprint.vue';
+    import MasterPassword from '../components/MasterPassword.vue';
     import VersionButton from '../components/VersionButton.vue';
 
     function fetchPasswords(store) {
@@ -223,7 +207,7 @@
         name: 'password-generator-view',
         components: {
             RemoveAutoComplete,
-            Fingerprint,
+            MasterPassword,
             VersionButton
         },
         computed: mapGetters(['passwords', 'password', 'version']),
@@ -268,7 +252,7 @@
                 showOptions: false,
                 showError: false,
                 generatingPassword: false,
-                optionsSaved: false,
+                optionsSaved: false
             }
         },
         watch: {
@@ -316,13 +300,9 @@
             'masterPassword': function () {
                 this.cleanErrors();
                 this.cleanFormInSeconds(30);
-                this.showFingerprint();
             }
         },
         methods: {
-            showFingerprint: debounce(function () {
-                this.fingerprint = this.masterPassword;
-            }, 1000),
             togglePasswordType(element){
                 if (element.type === 'password') {
                     element.type = 'text';