diff --git a/src/App.vue b/src/App.vue
index 96b68a43a..4cd843eb9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -105,6 +105,12 @@
 				localStorage.setItem('passwordResetToken', this.$route.query.userPasswordReset)
                 router.push({name: 'passwordReset'})
 			}
+            // Email verification
+            if(this.$route.query.userEmailConfirm !== undefined) {
+                localStorage.removeItem('emailConfirmToken') // Delete an eventually preexisting old token
+                localStorage.setItem('emailConfirmToken', this.$route.query.userEmailConfirm)
+                router.push({name: 'login'})
+			}
 		},
         created() {
             if (this.user.authenticated) {
diff --git a/src/components/user/Login.vue b/src/components/user/Login.vue
index e7dd3596d..7f0258af5 100644
--- a/src/components/user/Login.vue
+++ b/src/components/user/Login.vue
@@ -2,6 +2,9 @@
 	<div>
 		<h2 class="title">Login</h2>
 		<div class="box">
+			<div v-if="confirmedEmailSuccess" class="notification is-success has-text-centered">
+				You successfully confirmed your email! You can log in now.
+			</div>
 			<form id="loginform" @submit.prevent="submit">
 				<div class="field">
 					<div class="control">
@@ -32,6 +35,7 @@
 <script>
     import auth from '../../auth'
     import router from '../../router'
+    import {HTTP} from '../../http-common'
 
     export default {
         data() {
@@ -41,10 +45,27 @@
                     password: ''
                 },
                 error: '',
+                confirmedEmailSuccess: false,
                 loading: false
             }
         },
         beforeMount() {
+            // Try to verify the email
+			let emailVerifyToken = localStorage.getItem('emailConfirmToken')
+			if (emailVerifyToken !== '') {
+				this.loading = true
+				HTTP.post(`user/confirm`, {token: emailVerifyToken})
+					.then(() => {
+                        localStorage.removeItem('emailConfirmToken')
+                        this.loading = false
+                        this.confirmedEmailSuccess = true
+                    })
+                    .catch(e => {
+                        this.loading = false
+                        this.error = e.response.data.message
+                    })
+			}
+
             // Check if the user is already logged in, if so, redirect him to the homepage
             if (auth.user.authenticated) {
                 router.push({name: 'home'})
diff --git a/todo.md b/todo.md
index 63545a6bd..ce072537a 100644
--- a/todo.md
+++ b/todo.md
@@ -59,6 +59,6 @@
 * [ ] Google fonts raus (sollen von lokal geladen werden)
 * [ ] Ladeanimationen erst nach 100ms anzeigen, sonst wird das überflüssigerweise angezeigt
 
-* [ ] Userstuff
-    * [ ] Email-Verification
+* [x] Userstuff
+    * [x] Email-Verification
     * [x] Password forgot
\ No newline at end of file