diff --git a/frontend/src/lib/components/Login.svelte b/frontend/src/lib/components/Login.svelte
index 515470ca54..2653038fae 100644
--- a/frontend/src/lib/components/Login.svelte
+++ b/frontend/src/lib/components/Login.svelte
@@ -15,7 +15,7 @@
 	import { sendUserToast } from '$lib/toast'
 	import { isCloudHosted } from '$lib/cloud'
 	import { refreshSuperadmin } from '$lib/refreshUser'
-	import { createEventDispatcher } from 'svelte'
+	import { createEventDispatcher, onMount } from 'svelte'
 
 	export let rd: string | undefined = undefined
 	export let email: string | undefined = undefined
@@ -171,6 +171,14 @@
 
 	const dispatch = createEventDispatcher()
 
+	onMount(() => {
+		try {
+			localStorage.removeItem('closeUponLogin')
+		} catch (e) {
+			console.error('Could not remove closeUponLogin from local storage', e)
+		}
+	})
+	
 	function popupListener(event) {
 		let data = event.data
 		if (event.origin !== window.location.origin) {
@@ -199,6 +207,7 @@
 			window.addEventListener('message', popupListener)
 			window.open(url, '_blank', 'popup')
 		} else {
+			localStorage.setItem('closeUponLogin', 'false')
 			window.location.href = url
 		}
 	}
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
index a443df6b96..fbb18311a8 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
@@ -80,6 +80,7 @@
 	}
 
 	try {
+		
 		setLicense()
 		redirectIfNecessary()
 		checkFirstTimeSetup()