diff --git a/frontend/src/lib/i18n/locales/de.json b/frontend/src/lib/i18n/locales/de.json
index f63b256..c68f1b4 100644
--- a/frontend/src/lib/i18n/locales/de.json
+++ b/frontend/src/lib/i18n/locales/de.json
@@ -109,7 +109,8 @@
         "multiple_choice": "Multiple-Choice",
         "private": "Privat",
         "dashboard": "Dashboard",
-        "question_plural": "Fragen"
+        "question_plural": "Fragen",
+        "game_pin": "Spiel-Pin"
     },
     "editor": {
         "time_in_seconds": "Zeit in Sekunden",
diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json
index 6ad7152..1d8567d 100644
--- a/frontend/src/lib/i18n/locales/en.json
+++ b/frontend/src/lib/i18n/locales/en.json
@@ -109,7 +109,8 @@
         "multiple_choice": "Multiple-Choice",
         "private": "Private",
         "dashboard": "Dashboard",
-        "question_plural": "Questions"
+        "question_plural": "Questions",
+        "game_pin": "Game Pin"
     },
     "editor": {
         "time_in_seconds": "Time in seconds",
diff --git a/frontend/src/lib/play/join.svelte b/frontend/src/lib/play/join.svelte
index 0d2ed1e..ee74a27 100644
--- a/frontend/src/lib/play/join.svelte
+++ b/frontend/src/lib/play/join.svelte
@@ -9,7 +9,9 @@
 	import { browser } from '$app/env';
 	import * as Sentry from '@sentry/browser';
 	import { alertModal } from '../stores';
+	import { getLocalization } from '$lib/i18n';
 
+	const { t } = getLocalization();
 	export let game_pin: string;
 
 	let username = '';
@@ -114,9 +116,9 @@
 {#if game_pin === '' || game_pin.length <= 7}
 	<div class="flex flex-col justify-center align-center w-screen h-screen">
 		<form on:submit|preventDefault class="flex-col flex justify-center align-center mx-auto">
-			<h1 class="text-lg text-center">Game Pin</h1>
+			<h1 class="text-lg text-center">{$t('words.game_pin')}</h1>
 			<input
-				class="border border-amber-800 self-center text-center text-black"
+				class="border border-gray-400 self-center text-center text-black ring-0 outline-none p-2 rounded-lg focus:shadow-2xl transition-all"
 				bind:value={game_pin}
 				maxlength="8"
 			/>
@@ -128,7 +130,7 @@
 				type="submit"
 				disabled={game_pin.length <= 7}
 			>
-				Submit
+				{$t('words.submit')}
 			</button>
 		</form>
 	</div>
@@ -138,14 +140,14 @@
 			on:submit|preventDefault={setUsername}
 			class="flex-col flex justify-center align-center mx-auto"
 		>
-			<h1 class="text-lg text-center">Username</h1>
+			<h1 class="text-lg text-center">{$t('words.username')}</h1>
 			<input class="border border-amber-800 text-black text-center" bind:value={username} />
 			<button
 				class="bg-amber-800 hover:bg-amber-700 text-white font-bold py-2 px-4 rounded disabled:cursor-not-allowed disabled:opacity-50 mt-2"
 				type="submit"
 				disabled={username.length <= 3}
 			>
-				Submit
+				{$t('words.submit')}
 			</button>
 		</form>
 	</div>
diff --git a/frontend/src/lib/play/question.svelte b/frontend/src/lib/play/question.svelte
index 29869c8..718f803 100644
--- a/frontend/src/lib/play/question.svelte
+++ b/frontend/src/lib/play/question.svelte
@@ -8,6 +8,9 @@
 	import { QuizQuestionType } from '$lib/quiz_types';
 	import { socket } from '$lib/socket';
 	import Spinner from '../Spinner.svelte';
+	import { getLocalization } from '$lib/i18n';
+
+	const { t } = getLocalization();
 
 	export let question: Question;
 	export let question_index: string | number;
@@ -109,7 +112,7 @@
 					class="w-1/2 text-3xl bg-amber-700 my-2 disabled:opacity-60 border border-white"
 					disabled={selected_answer !== undefined}
 					on:click={() => selectAnswer(slider_value[0])}
-					>Submit
+					>{$t('words.submit')}
 				</button>
 			</div>
 		{/await}