diff --git a/src/App.vue b/src/App.vue
index 9af16eb..9322289 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -251,6 +251,12 @@
             this.countCores();
             this.initWorkers();
             window['benchmark'] = this.benchmark;
+
+            this.$root.$on('event', (name) => {
+                if (window['umami']) {
+                    window['umami'].trackEvent(name, 'click');
+                }
+            });
         }
     };
 
diff --git a/src/vue/Description.vue b/src/vue/Description.vue
index 296e25c..f91e807 100644
--- a/src/vue/Description.vue
+++ b/src/vue/Description.vue
@@ -5,7 +5,7 @@
             Enter a short prefix/suffix of your choice, and click ‘generate’ to start.
         </p>
         <div class="shortcut">
-            <button type="button" class="button-large umami--click--start-now" @click="scrollDown">Start now</button>
+            <button type="button" class="button-large" @click="scrollDown">Start now</button>
         </div>
 
         <h2>What's a vanity address?</h2>
@@ -66,6 +66,7 @@
         methods: {
             scrollDown() {
                 this.scrollTo(document.getElementById('input-panel'), -1);
+                this.$root.$emit('event', 'Start now');
             },
             scrollTo(element, lastValue) {
                 let currentValue = window.scrollY;
diff --git a/src/vue/Input.vue b/src/vue/Input.vue
index 754da65..1604efc 100644
--- a/src/vue/Input.vue
+++ b/src/vue/Input.vue
@@ -48,11 +48,11 @@
             <div class="row">
                 <div class="col-lg-6 col-sm-12">
                     <input type="button" value="Generate" class="button-large hide-render" disabled>
-                    <input type="button" value="Generate" class="button-large hide-prerender umami--click--generate" @click="startGen"
+                    <input type="button" value="Generate" class="button-large hide-prerender" @click="startGen"
                            :disabled="running || inputError || error">
                 </div>
                 <div class="col-lg-6 col-sm-12">
-                    <input type="button" value="Stop" class="button-large umami--click--stop" @click="stopGen" :disabled="!running">
+                    <input type="button" value="Stop" class="button-large" @click="stopGen" :disabled="!running">
                 </div>
             </div>
         </form>
@@ -106,10 +106,12 @@
             startGen: function () {
                 if (!this.running && !this.inputError && !this.error) {
                     this.$emit('start');
+                    this.$root.$emit('event', 'Generate');
                 }
             },
             stopGen: function () {
                 this.$emit('stop');
+                this.$root.$emit('event', 'Stop');
             }
         },
         watch: {
diff --git a/src/vue/Save.vue b/src/vue/Save.vue
index a8e2730..c8c3db7 100644
--- a/src/vue/Save.vue
+++ b/src/vue/Save.vue
@@ -44,6 +44,7 @@
             save() {
                 if (this.password) {
                     this.loading = true;
+                    this.$root.$emit('event', 'Download');
 
                     setTimeout(() => {
                         const wallet = this.generateWallet(this.privateKey, this.password);