diff --git a/frontend/src/routes/(candidate)/(authenticated)/dashboard/+layout.server.ts b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+layout.server.ts
index 400f787..d50f32d 100644
--- a/frontend/src/routes/(candidate)/(authenticated)/dashboard/+layout.server.ts
+++ b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+layout.server.ts
@@ -8,4 +8,12 @@ export const load: LayoutServerLoad = async ({ fetch }) => {
 	if (details === null) {
 		throw redirect(302, '/register');
 	}
+
+	return {
+		candidate: {
+			name: details.name,
+			surname: details.surname,
+			email: details.email
+		}
+	};
 };
diff --git a/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte
index 2fbf528..78e747a 100644
--- a/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte
+++ b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte
@@ -11,15 +11,10 @@
 	import PortfolioLetterUploadCard from '$lib/components/dashboard/PortfolioLetterUploadCard.svelte';
 	import PortfolioZipUploadCard from '$lib/components/dashboard/PortfolioZipUploadCard.svelte';
 	import { fetchSubmProgress } from '$lib/stores/portfolio';
+	import type { PageData } from './$types';
 
 	
-	let fullName = "";
-	let email = "";
-
-	$: if ($candidateData) {
-		fullName = ($candidateData.name ?? "") + " " + ($candidateData.surname ?? "");
-		email = $candidateData.email ?? "";
-	}
+	export let data: PageData;
 
 	fetchSubmProgress(); // TODO: move to a better place
 
@@ -39,8 +34,8 @@
 <FullLayout>
 	<div class="dashboard dashboardDesktop">
 		<div class="name col-span-3">
-			<DashboardInfoCard title={fullName}>
-				<span class="mt-3 text-sspsBlue truncate">{email}</span>
+			<DashboardInfoCard title={data.candidate.name ?? ""}>
+				<span class="mt-3 text-sspsBlue truncate">{data.candidate.email}</span>
 				<span class="mt-3 text-sspsGray text-xs">Uchazeč na SSPŠ</span>
 			</DashboardInfoCard>
 		</div>
@@ -56,8 +51,8 @@
 	</div>
 	<div class="dashboard dashboardMobile">
 		<div class="my-10 name w-[90%] mx-auto">
-			<DashboardInfoCard title={fullName}>
-				<span class="mt-3 text-sspsBlue truncate">{fullName}</span>
+			<DashboardInfoCard title={data.candidate.name ?? ""}>
+				<span class="mt-3 text-sspsBlue truncate">{data.candidate.email}</span>
 				<span class="mt-3 text-sspsGray text-xs">Uchazeč na SSPŠ</span>
 			</DashboardInfoCard>
 		</div>