diff --git a/src/vue/Input.vue b/src/vue/Input.vue
index 4cd8b6b..d9025fc 100644
--- a/src/vue/Input.vue
+++ b/src/vue/Input.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="panel">
-        <form :class="{error: inputError}">
+        <form :class="{error: inputError}" v-on:submit.prevent="startGen">
             <div class="error-text">Numbers and letters from A to F only</div>
             <input type="text" class="text-input-large" placeholder="Prefix" v-model="prefix" :disabled="running">
             <div class="check">
@@ -54,7 +54,9 @@
         },
         methods: {
             startGen: function () {
-                this.$emit('start')
+                if(!this.running && !this.inputError && !this.error){
+                    this.$emit('start')
+                }
             },
             stopGen: function () {
                 this.$emit('stop')
diff --git a/src/vue/Save.vue b/src/vue/Save.vue
index 8cb3dd0..d07f79c 100644
--- a/src/vue/Save.vue
+++ b/src/vue/Save.vue
@@ -1,13 +1,18 @@
 <template>
     <div class="remodal" data-remodal-id="modal" data-remodal-options="hashTracking: false">
         <button data-remodal-action="close" class="remodal-close"></button>
-        <h3 class="title">Download encrypted keystore file (UTC / JSON)</h3>
-        <div>
-            <input type="password" class="text-input-large" v-model="password" placeholder="Password">
-        </div>
-        <div>
-            <button class="button-large" @click="save" :disabled="!password || !privateKey">Save</button>
-        </div>
+        <h3 class="title">Create encrypted keystore file (UTC / JSON)</h3>
+        <form v-on:submit.prevent="save">
+            <div>
+                <input type="password" autocomplete="new-password" class="text-input-large" v-model="password"
+                       placeholder="Password">
+            </div>
+            <div>
+                <button type="button" class="button-large" @click="save" :disabled="!password || !privateKey">
+                    Download
+                </button>
+            </div>
+        </form>
     </div>
 </template>
 
@@ -33,11 +38,13 @@
         },
         methods: {
             save() {
-                const rb = randomBytes(48);
-                window.keythereum.dump(this.password, this.privateKey, rb.slice(0, 32), rb.slice(32), {}, (obj) => {
-                    const fileName = "UTC--" + new Date().toISOString().replace(/:/g, '-') + "--" + obj.address;
-                    download(JSON.stringify(obj), fileName, "application/json");
-                });
+                if (this.password) {
+                    const rb = randomBytes(48);
+                    window.keythereum.dump(this.password, this.privateKey, rb.slice(0, 32), rb.slice(32), {}, (obj) => {
+                        const fileName = "UTC--" + new Date().toISOString().replace(/:/g, '-') + "--" + obj.address;
+                        download(JSON.stringify(obj), fileName, "application/json");
+                    });
+                }
             },
         }
     }