diff --git a/frontend/src/lib/service/authApiService.ts b/frontend/src/lib/service/authApiService.ts
index ea46a5c..ee07ca3 100644
--- a/frontend/src/lib/service/authApiService.ts
+++ b/frontend/src/lib/service/authApiService.ts
@@ -223,7 +223,8 @@ export const disableTwoFa = async (
 		'PUT',
 		request,
 		TwoFaDisableRequestSchema,
-		UserWithTokenResponseSchema
+		UserWithTokenResponseSchema,
+		true
 	);
 };
 
diff --git a/frontend/src/routes/user/settings/DisableTwoFa.svelte b/frontend/src/routes/user/settings/DisableTwoFa.svelte
index 9272e68..a92abe8 100644
--- a/frontend/src/routes/user/settings/DisableTwoFa.svelte
+++ b/frontend/src/routes/user/settings/DisableTwoFa.svelte
@@ -23,12 +23,15 @@
 				if (!form.valid) return;
 
 				try {
-					const user = await disableTwoFa(form.data);
+					await disableTwoFa(form.data);
 
-					toast.success('2FA disabled successfully!');
+					toast.success('2FA disabled successfully, please log in again.');
 
-					userStore.login(user);
+					userStore.logout();
 					closeShowTwoFaForm();
+					setTimeout(() => {
+						goto('/login');
+					}, 0);
 				} catch (error) {
 					if (error instanceof AuthError && error.status === 401) {
 						setError(form, 'password', 'Invalid password');