diff --git a/src/router/index.ts b/src/router/index.ts
index f24a77a225..2a10fa4b35 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -482,7 +482,7 @@ export function getAuthForRoute(route: RouteLocation) {
 		].includes(route.name as string) &&
 		localStorage.getItem('passwordResetToken') === null &&
 		localStorage.getItem('emailConfirmToken') === null &&
-		!(route.name === 'home' && typeof route.query.userPasswordReset !== 'undefined')
+		!(route.name === 'home' && (typeof route.query.userPasswordReset !== 'undefined' || typeof route.query.userEmailConfirm !== 'undefined'))
 	) {
 		saveLastVisited(route.name as string, route.params)
 		return {name: 'user.login'}
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index b9c16bad5f..7bece3482d 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -288,11 +288,11 @@ export const useAuthStore = defineStore('auth', {
 				const stopLoading = setModuleLoading(this)
 				try {
 					await HTTPFactory().post('user/confirm', {token: emailVerifyToken})
-					localStorage.removeItem('emailConfirmToken')
 					return true
 				} catch(e) {
 					throw new Error(e.response.data.message)
 				} finally {
+					localStorage.removeItem('emailConfirmToken')
 					stopLoading()
 				}
 			}