diff --git a/src/lib/common/apiFunctions.svelte b/src/lib/common/apiFunctions.svelte
index 269a941..9e793ce 100644
--- a/src/lib/common/apiFunctions.svelte
+++ b/src/lib/common/apiFunctions.svelte
@@ -203,6 +203,7 @@
 
 		await headscalePreAuthKeyResponse.json().then((data) => {
 			headscalePreAuthKey = data.preAuthKeys;
+			console.log(headscalePreAuthKey);
 		});
 		return headscalePreAuthKey;
 	}
diff --git a/src/lib/common/classes.ts b/src/lib/common/classes.ts
index e780624..4b0e2f8 100644
--- a/src/lib/common/classes.ts
+++ b/src/lib/common/classes.ts
@@ -28,6 +28,7 @@ export class PreAuthKey {
   public expiration: string = '';
   public reusable: boolean = false;
   public ephemeral: boolean = false;
+  public used: boolean = false;
 
   public constructor(init?: Partial<Device>) {
     Object.assign(this, init);
diff --git a/src/lib/index/UserCard/CreateUser.svelte b/src/lib/index/CreateUser.svelte
similarity index 100%
rename from src/lib/index/UserCard/CreateUser.svelte
rename to src/lib/index/CreateUser.svelte
diff --git a/src/lib/index/UserCard/PreAuthKeys.svelte b/src/lib/index/UserCard/PreAuthKeys.svelte
index 6973e1d..3273268 100644
--- a/src/lib/index/UserCard/PreAuthKeys.svelte
+++ b/src/lib/index/UserCard/PreAuthKeys.svelte
@@ -7,11 +7,14 @@
 	export let user = new User();
 	let keyList = [new PreAuthKey()];
 
-	function testExpiry(keyExpiry: string): string {
-		if((new Date(keyExpiry)).getTime() > (new Date()).getTime()) {
-			return "text-success"
+	// If the key hasn't expired or key hasn't been used, flag as green, otherwise flag as red
+	function testExpiry(keyExpiry: string, keyUsed: boolean): string {
+		if (new Date(keyExpiry).getTime() > new Date().getTime()) {
+			if (!keyUsed) {
+				return 'text-success';
+			}
 		}
-		return "text-error"
+		return 'text-error';
 	}
 
 	function getPreauthKeysAction() {
@@ -36,7 +39,7 @@
 	<td
 		><ul class="list-disc list-inside">
 			{#each keyList as key}
-			<li><span class="{testExpiry(key.expiration)}">{key.key} </span></li>
+				<li><span class="{testExpiry(key.expiration, key.used)}">{key.key} </span></li>
 			{/each}
 		</ul></td
 	>
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index f97361d..ff4d484 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -1,6 +1,6 @@
 <!-- typescript -->
 <script lang="ts">
-	import CreateUser from '$lib/index/UserCard/CreateUser.svelte';
+	import CreateUser from '$lib/index/CreateUser.svelte';
 	import UserCard from '$lib/index/UserCard.svelte';
 	import { headscaleUserStore, apiTestStore } from '$lib/common/stores';
 	import { onMount } from 'svelte';