diff --git a/src/App.vue b/src/App.vue
index 5b99838..6c00a3e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,7 +41,7 @@
         </div>
 
         <!--Save modal-->
-        <save :private-key="result.privateKey"></save>
+        <save :address="result.address.toLowerCase()" :private-key="result.privateKey"></save>
 
         <!--Footer-->
         <foot></foot>
diff --git a/src/vue/Save.vue b/src/vue/Save.vue
index ee1e264..92a724e 100644
--- a/src/vue/Save.vue
+++ b/src/vue/Save.vue
@@ -23,12 +23,11 @@
 
     import {v4} from 'uuid';
     import CryptoJS from 'crypto-js';
-    import secp256k1 from 'secp256k1';
-    import keccak from 'keccak';
 
     export default {
         props: {
-            privateKey: String
+            privateKey: String,
+            address: String
         },
         data: function () {
             return {
@@ -48,7 +47,7 @@
 
                     setTimeout(() => {
                         const wallet = this.generateWallet(this.privateKey, this.password);
-                        const fileName = 'UTC--' + new Date().toISOString().replace(/:/g, '-') + '--' + wallet.address;
+                        const fileName = 'UTC--' + new Date().toISOString().replace(/:/g, '-') + '--' + this.address;
                         download(JSON.stringify(wallet), fileName, "application/json");
                         this.loading = false;
                     }, 20);
@@ -59,18 +58,13 @@
             generateWallet(privateKey, password) {
                 privateKey = Buffer.from(privateKey, 'hex');
                 return {
-                    address: this.privateToAddress(privateKey),
+                    address: this.address,
                     crypto: this.encryptPrivateKey(privateKey, password),
                     id: v4(),
                     version: 3
                 };
             },
 
-            privateToAddress(privateKey) {
-                const pub = secp256k1.publicKeyCreate(privateKey, false).slice(1);
-                return keccak('keccak256').update(pub).digest().slice(-20).toString('hex');
-            },
-
             sliceWordArray(wordArray, start, end) {
                 const newArray = wordArray.clone();
                 newArray.words = newArray.words.slice(start, end);