diff --git a/src/App.vue b/src/App.vue
index 61f0137535..b1818ca5fb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -265,6 +265,12 @@
 				router.push({name: 'login'})
 			}
 		},
+		beforeCreate() {
+			// Check if the user is already logged in, if so, redirect them to the homepage
+			if (!this.userAuthenticated && this.$route.name !== 'login') {
+				router.push({name: 'login'})
+			}
+		},
 		created() {
 			this.$store.dispatch('config/update')
 			this.$store.dispatch('auth/checkAuth')
diff --git a/src/components/Home.vue b/src/components/Home.vue
index b16d821f6f..0b59a7937e 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -9,16 +9,19 @@
 		>
 			Import your data into Vikunja
 		</router-link>
-		<TaskOverview :show-all="true"/>
+		<ShowTasks :show-all="true"/>
 	</div>
 </template>
 
 <script>
-	import router from '../router'
 	import {mapState} from 'vuex'
+	import ShowTasks from './tasks/ShowTasks'
 
 	export default {
-		name: "Home",
+		name: 'Home',
+		components: {
+			ShowTasks,
+		},
 		data() {
 			return {
 				loading: false,
@@ -26,12 +29,6 @@
 				tasks: []
 			}
 		},
-		beforeMount() {
-			// Check if the user is already logged in, if so, redirect him to the homepage
-			if (!this.authenticated) {
-				router.push({name: 'login'})
-			}
-		},
 		computed: mapState({
 			migratorsEnabled: state => state.config.availableMigrators !== null && state.config.availableMigrators.length > 0,
 			authenticated: state => state.auth.authenticated,
diff --git a/src/components/tasks/ShowTasksInRange.vue b/src/components/tasks/ShowTasksInRange.vue
index 73b754faa7..003e4e37a5 100644
--- a/src/components/tasks/ShowTasksInRange.vue
+++ b/src/components/tasks/ShowTasksInRange.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="content has-text-centered">
-		<TaskOverview
+		<ShowTasks
 			:start-date="startDate"
 			:end-date="endDate"
 		/>
@@ -8,8 +8,13 @@
 </template>
 
 <script>
+	import ShowTasks from './ShowTasks'
+
 	export default {
-		name: "ShowTasksInRange",
+		name: 'ShowTasksInRange',
+		components: {
+			ShowTasks,
+		},
 		data() {
 			return {
 				startDate: new Date(this.$route.params.startDateUnix),
diff --git a/src/main.js b/src/main.js
index 166b06f7b1..8f1daa22c1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,10 +14,6 @@ if(window.API_URL.substr(window.API_URL.length - 1, window.API_URL.length) === '
 import Modal from './components/modal/Modal'
 Vue.component('modal', Modal)
 
-// Register the task overview component
-import TaskOverview from './components/tasks/ShowTasks'
-Vue.component('TaskOverview', TaskOverview)
-
 // Add CSS
 import './styles/vikunja.scss'