diff --git a/frontend/src/lib/components/SubscriptionEditForm.svelte b/frontend/src/lib/components/SubscriptionEditForm.svelte
index 11c9d01..17ff19f 100644
--- a/frontend/src/lib/components/SubscriptionEditForm.svelte
+++ b/frontend/src/lib/components/SubscriptionEditForm.svelte
@@ -29,11 +29,8 @@
 		included_hours_per_month: 0
 	};
 
-	$: {
-		if (subscription !== undefined) {
-			subscription = subscription === null ? { ...blankSubscription } : { ...subscription };
-		}
-	}
+	console.log('Opening subscription modal with:', subscription);
+	$: subscription = subscription || { ...blankSubscription };
 	$: isLoading = subscription === undefined || user === undefined;
 	let isUpdating = false;
 
@@ -56,8 +53,10 @@
 	<SmallLoader width={30} message={$t('loading.subscription_data')} />
 {:else if user && subscription}
 	<form class="content" action="?/updateSubscription" method="POST" use:enhance={handleUpdate}>
-		<input name="usbscription[id]" type="hidden" bind:value={subscription.id} />
-		<h1 class="step-title" style="text-align: center;">{$t('subscritption.edit')}</h1>
+		<input name="susbscription[id]" type="hidden" bind:value={subscription.id} />
+		<h1 class="step-title" style="text-align: center;">
+			{subscription.id ? $t('subscription.edit') : $t('subscription.create')}
+		</h1>
 		{#if form?.errors}
 			{#each form?.errors as error (error.id)}
 				<h4
@@ -76,7 +75,7 @@
 				bind:value={subscription.name}
 				placeholder={$t('placeholder.subscription_name')}
 				required={true}
-				readonly={user.role_id < 8}
+				readonly={subscription.id > 0}
 			/>
 			<InputField
 				name="subscription[details]"
@@ -92,7 +91,7 @@
 				label={$t('subscription.conditions')}
 				bind:value={subscription.conditions}
 				placeholder={$t('placeholder.subscription_conditions')}
-				readonly={user.role_id < 8}
+				readonly={subscription.id > 0}
 			/>
 			<InputField
 				name="subscription[monthly_fee]"
@@ -101,7 +100,7 @@
 				bind:value={subscription.monthly_fee}
 				placeholder={$t('placeholder.subscription_monthly_fee')}
 				required={true}
-				readonly={user.role_id < 8}
+				readonly={subscription.id > 0}
 			/>
 			<InputField
 				name="subscription[hourly_rate]"
@@ -109,21 +108,21 @@
 				label={$t('subscription.hourly_rate')}
 				bind:value={subscription.hourly_rate}
 				required={true}
-				readonly={user.role_id < 8}
+				readonly={subscription.id > 0}
 			/>
 			<InputField
 				name="subscription[included_hours_per_year]"
 				type="number"
 				label={$t('subscription.included_hours_per_year')}
 				bind:value={subscription.included_hours_per_year}
-				readonly={user.role_id < 8}
+				readonly={subscription.id > 0}
 			/>
 			<InputField
 				name="included_hours_per_month"
 				type="number"
 				label={$t('subscription.included_hours_per_month')}
 				bind:value={subscription.included_hours_per_month}
-				readonly={user.role_id < 8}
+				readonly={subscription.id > 0}
 			/>
 		</div>
 		<div class="button-container">