diff --git a/src/lib/components/Input/Input.svelte b/src/lib/components/Input/Input.svelte
index ba32f03..09f898e 100644
--- a/src/lib/components/Input/Input.svelte
+++ b/src/lib/components/Input/Input.svelte
@@ -98,6 +98,7 @@
 					class:input-lg={type !== 'checkbox' && size === 'lg'}
 					class:input-bordered={type !== 'checkbox'}
 					class:pr-11={initialType === 'password'}
+					class:!border-none,!text-inherit={disabled}
 					{id}
 					{name}
 					{type}
diff --git a/src/lib/components/Input/Select.svelte b/src/lib/components/Input/Select.svelte
index 6b27acc..92ef3fe 100644
--- a/src/lib/components/Input/Select.svelte
+++ b/src/lib/components/Input/Select.svelte
@@ -46,6 +46,7 @@
 		class:select-sm={size === 'sm'}
 		class:select-md={size === 'md'}
 		class:select-lg={size === 'lg'}
+		class:!border-none,!text-inherit={disabled}
 		{id}
 		{name}
 		{required}
diff --git a/src/lib/components/Input/Textarea.svelte b/src/lib/components/Input/Textarea.svelte
index 5e83fc4..f07bc57 100644
--- a/src/lib/components/Input/Textarea.svelte
+++ b/src/lib/components/Input/Textarea.svelte
@@ -41,6 +41,7 @@
 		class:textarea-sm={size === 'sm'}
 		class:textarea-md={size === 'md'}
 		class:textarea-lg={size === 'lg'}
+		class:!border-none,!text-inherit={disabled}
 		{id}
 		{name}
 		{required}
diff --git a/src/routes/register/RegistrationComplete.svelte b/src/routes/register/RegistrationComplete.svelte
index 4d45a25..70329a7 100644
--- a/src/routes/register/RegistrationComplete.svelte
+++ b/src/routes/register/RegistrationComplete.svelte
@@ -82,27 +82,27 @@
 <div class="divider"></div>
 <div class="flex justify-around mt-2 mb-4">
 	<div class="grid grid-cols-1 sm:grid-cols-2 w-full sm:w-fit gap-x-4 gap-y-2">
-		<Input value={firstname} size="sm" readonly>
+		<Input value={firstname} size="sm" disabled>
 			{#snippet label()}
 				<span>Vorname</span>
 			{/snippet}
 		</Input>
-		<Input value={lastname} size="sm" readonly>
+		<Input value={lastname} size="sm" disabled>
 			{#snippet label()}
 				<span>Nachname</span>
 			{/snippet}
 		</Input>
-		<Input value={birthday.toISOString().substring(0, 10)} type="date" size="sm" readonly>
+		<Input value={birthday.toISOString().substring(0, 10)} type="date" size="sm" disabled>
 			{#snippet label()}
 				<span>Geburtstag</span>
 			{/snippet}</Input
 		>
-		<Input value={phone} size="sm" readonly>
+		<Input value={phone} size="sm" disabled>
 			{#snippet label()}
 				<span>Telefonnummer</span>
 			{/snippet}
 		</Input>
-		<Input value={username} size="sm" readonly>
+		<Input value={username} size="sm" disabled>
 			{#snippet label()}
 				<span>Spielername</span>
 			{/snippet}
diff --git a/src/routes/report/[...url_hash]/ReportSubmitted.svelte b/src/routes/report/[...url_hash]/ReportSubmitted.svelte
index 8047766..400f5e5 100644
--- a/src/routes/report/[...url_hash]/ReportSubmitted.svelte
+++ b/src/routes/report/[...url_hash]/ReportSubmitted.svelte
@@ -46,13 +46,13 @@
 		</span>
 	</h4>
 	<div class="my-4">
-		<Input type="text" size="sm" value={reason} readonly={true} pickyWidth={false}>
+		<Input type="text" size="sm" value={reason} disabled={true} pickyWidth={false}>
 			{#snippet label()}
 				<span>Report Grund</span>
 			{/snippet}
 		</Input>
-		<Textarea readonly={true} rows={4} value={body} label="Report Details" />
+		<Textarea disabled={true} rows={4} value={body} label="Report Details" />
 	</div>
 	<div class="divider divider-vertical mb-1"></div>
-	<Textarea readonly={true} rows={4} label="Admin Kommentar" value={statement} />
+	<Textarea disabled={true} rows={4} label="Admin Kommentar" value={statement} />
 </div>