diff --git a/changes/changelog.d/407.enhancement b/changes/changelog.d/407.enhancement
new file mode 100644
index 000000000..c21a34063
--- /dev/null
+++ b/changes/changelog.d/407.enhancement
@@ -0,0 +1 @@
+Confirm email without requiring the user to validate the form manually (#407)
\ No newline at end of file
diff --git a/front/src/EmbedFrame.vue b/front/src/EmbedFrame.vue
index a8dcce4fa..afee7c82f 100644
--- a/front/src/EmbedFrame.vue
+++ b/front/src/EmbedFrame.vue
@@ -89,7 +89,6 @@
           <tr
             :id="'queue-item-' + index"
             role="button"
-            tabindex="0"
             v-if="track.sources.length > 0"
             :key="index"
             :class="[{active: index === currentIndex}]"
diff --git a/front/src/components/auth/LoginForm.vue b/front/src/components/auth/LoginForm.vue
index f0591a538..3f6eb0edb 100644
--- a/front/src/components/auth/LoginForm.vue
+++ b/front/src/components/auth/LoginForm.vue
@@ -40,7 +40,7 @@
             <translate translate-context="*/Login/*/Verb">Reset your password</translate>
           </router-link>
         </label>
-        <password-input :index="2" required v-model="credentials.password" />
+        <password-input required v-model="credentials.password" />
 
       </div>
     </template>
diff --git a/front/src/components/forms/PasswordInput.vue b/front/src/components/forms/PasswordInput.vue
index fe1a01a9f..2e4f227a5 100644
--- a/front/src/components/forms/PasswordInput.vue
+++ b/front/src/components/forms/PasswordInput.vue
@@ -3,7 +3,6 @@
     <input
     required
     name="password"
-    :tabindex="index"
     :type="passwordInputType"
     @input="$emit('input', $event.target.value)"
     :value="value">
@@ -30,7 +29,7 @@ function copyStringToClipboard (str) {
 }
 
 export default {
-  props: ['value', 'index', 'defaultShow', 'copyButton'],
+  props: ['value', 'defaultShow', 'copyButton'],
   data () {
     return {
       showPassword: this.defaultShow || false,
diff --git a/front/src/views/auth/EmailConfirm.vue b/front/src/views/auth/EmailConfirm.vue
index 26ccc5d70..4e255ffb9 100644
--- a/front/src/views/auth/EmailConfirm.vue
+++ b/front/src/views/auth/EmailConfirm.vue
@@ -52,6 +52,11 @@ export default {
       }
     }
   },
+  mounted () {
+    if (this.key) {
+      this.submit()
+    }
+  },
   methods: {
     submit() {
       let self = this