diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 3d9f9f12..0139f5ac 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -72,7 +72,6 @@
 				});
 		} else {
 			await $pocketbase.admins.authRefresh().catch(() => {
-				$pocketbase.authStore.clear();
 				goto('/login');
 			});
 		}
diff --git a/frontend/src/routes/account/+page.svelte b/frontend/src/routes/account/+page.svelte
index 491b7f86..c7eecab5 100644
--- a/frontend/src/routes/account/+page.svelte
+++ b/frontend/src/routes/account/+page.svelte
@@ -23,23 +23,21 @@
 
 	function changeAvatar() {
 		if ($isAdmin) {
+			if (!$pocketbase.authStore.model?.id) return;
 			$pocketbase.admins
-				.authRefresh()
-				.then((data) => {
-					data.admin.avatar = newAvatar;
-					$pocketbase.authStore.save(data.token, data.admin);
+				.update($pocketbase.authStore.model.id, { avatar: newAvatar })
+				.then(() => {
 					toast.success('Avatar saved.');
 				})
 				.catch((err) => {
 					toast.error(err.message);
 				});
 		} else {
+			if (!$pocketbase.authStore.model?.id) return;
 			$pocketbase
 				.collection('users')
-				.authRefresh()
-				.then((data) => {
-					data.record.avatar = newAvatar;
-					$pocketbase.authStore.save(data.token, data.record);
+				.update($pocketbase.authStore.model.id, { avatar: newAvatar })
+				.then(() => {
 					toast.success('Avatar saved.');
 				})
 				.catch((err) => {