diff --git a/src/routes/(nolayout)/login/+page.svelte b/src/routes/(nolayout)/login/+page.svelte
index 88cf6e5..d9d6a83 100644
--- a/src/routes/(nolayout)/login/+page.svelte
+++ b/src/routes/(nolayout)/login/+page.svelte
@@ -1,12 +1,18 @@
+<script>
+	let username, passwd;
+
+	function submit() {}
+</script>
+
 <svelte:head>
 	<title>Login - Rowblox</title>
 </svelte:head>
 
-<div class="max-w-lg mx-auto text-center text-white">
+<form on:submit|preventDefault={submit} class="max-w-lg mx-auto text-center text-white">
 	<img class="mx-auto" src="/favicon.png" alt="" />
 	<div class="flex flex-col">
-		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="username" name="username" id="username" placeholder="Username" />
-		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="password" id="password" placeholder="Password" />
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="username" name="username" id="username" placeholder="Username" bind:value={username} />
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="passwd" id="passwd" placeholder="Password" bind:value={passwd} />
 	</div>
-	<button class="my-1.5 text-xl text-white px-4 py-1 w-full rounded shadow-lg border-2 border-blue-500">Login</button>
-</div>
+	<input type="submit" class="my-1.5 text-xl text-white px-4 py-1 w-full rounded shadow-lg border-2 border-blue-500 hover:cursor-pointer" value="Login" />
+</form>
diff --git a/src/routes/(nolayout)/register/+page.svelte b/src/routes/(nolayout)/register/+page.svelte
index 5bd5149..29d9e2a 100644
--- a/src/routes/(nolayout)/register/+page.svelte
+++ b/src/routes/(nolayout)/register/+page.svelte
@@ -1,14 +1,20 @@
+<script>
+	let username, passwd, cpasswd, invite_key;
+
+	function submit() {}
+</script>
+
 <svelte:head>
 	<title>Register - Rowblox</title>
 </svelte:head>
 
-<div class="max-w-lg mx-auto text-center text-white">
+<form on:submit|preventDefault={submit} class="max-w-lg mx-auto text-center text-white">
 	<img class="mx-auto" src="/favicon.png" alt="" />
 	<div class="flex flex-col">
-		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="username" name="username" id="username" placeholder="Username" />
-		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="password" id="password" placeholder="Password" />
-		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="passwordconfirm" id="passwordconfirm" placeholder="Confirm Password" />
-		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="text" name="invite" id="invite" placeholder="Invite Key" />
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="username" name="username" id="username" placeholder="Username" bind:value={username} />
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="passwd" id="passwd" placeholder="Password" bind:value={passwd} />
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="password" name="cpasswd" id="cpasswd" placeholder="Confirm Password" bind:value={cpasswd} />
+		<input class="rounded-lg w-72 px-4 border-2 border-blue-500 text-black mx-auto my-1.5 py-2" type="text" name="invite" id="invite" placeholder="Invite Key" bind:value={invite_key} />
 	</div>
-	<button class="my-1.5 text-xl text-white px-4 py-1 w-full rounded shadow-lg border-2 border-blue-500">Register</button>
-</div>
+	<input type="submit" class="my-1.5 text-xl text-white px-4 py-1 w-full rounded shadow-lg border-2 border-blue-500 hover:cursor-pointer" value="Register" />
+</form>