diff --git a/web/src/app/mapfixes/[mapfixId]/page.tsx b/web/src/app/mapfixes/[mapfixId]/page.tsx
index 97bd0a1..c7e5047 100644
--- a/web/src/app/mapfixes/[mapfixId]/page.tsx
+++ b/web/src/app/mapfixes/[mapfixId]/page.tsx
@@ -86,16 +86,16 @@ export default function MapfixInfoPage() {
 	}, [mapfixId])
 
 	const comments:Comment[] = auditEvents.map((auditEvent) => {
-		let user = auditEvent.User.toString();
+		let username = auditEvent.Username;
 		if (auditEvent.User == 9223372036854776000) {
-			user = "[Validator]";
+			username = "[Validator]";
 		}
-		if (mapfix && auditEvent.User == mapfix.Submitter) {
-			user = "[Submitter]";
+		if (username === "" && mapfix && auditEvent.User == mapfix.Submitter) {
+			username = "[Submitter]";
 		}
 		return {
 			date: auditEvent.CreatedAt,
-			name: user,
+			name: username,
 			comment: auditEventMessage(auditEvent),
 		}
 	})
diff --git a/web/src/app/maps/[mapId]/fix/page.tsx b/web/src/app/maps/[mapId]/fix/page.tsx
index adac6c2..2ae2def 100644
--- a/web/src/app/maps/[mapId]/fix/page.tsx
+++ b/web/src/app/maps/[mapId]/fix/page.tsx
@@ -78,7 +78,7 @@ export default function MapfixInfoPage() {
 						width: "400px",
 						height: "50px",
 						marginInline: "auto"
-					}}>Submit</Button>
+					}}>Create Mapfix</Button>
 				</form>
 			</main>
 		</Webpage>
diff --git a/web/src/app/submissions/[submissionId]/page.tsx b/web/src/app/submissions/[submissionId]/page.tsx
index 2a0b83e..e2097d5 100644
--- a/web/src/app/submissions/[submissionId]/page.tsx
+++ b/web/src/app/submissions/[submissionId]/page.tsx
@@ -77,16 +77,16 @@ export default function SubmissionInfoPage() {
 	}, [submissionId])
 
 	const comments:Comment[] = auditEvents.map((auditEvent) => {
-		let user = auditEvent.User.toString();
+		let username = auditEvent.Username;
 		if (auditEvent.User == 9223372036854776000) {
-			user = "[Validator]";
+			username = "[Validator]";
 		}
-		if (submission && auditEvent.User == submission.Submitter) {
-			user = "[Submitter]";
+		if (username === "" && submission && auditEvent.User == submission.Submitter) {
+			username = "[Submitter]";
 		}
 		return {
 			date: auditEvent.CreatedAt,
-			name: user,
+			name: username,
 			comment: auditEventMessage(auditEvent),
 		}
 	})
diff --git a/web/src/app/submit/page.tsx b/web/src/app/submit/page.tsx
index b0a71e9..7e89ba8 100644
--- a/web/src/app/submit/page.tsx
+++ b/web/src/app/submit/page.tsx
@@ -82,7 +82,7 @@ export default function SubmissionInfoPage() {
 						width: "400px",
 						height: "50px",
 						marginInline: "auto"
-					}}>Submit</Button>
+					}}>Create Submission</Button>
 				</form>
 			</main>
 		</Webpage>
diff --git a/web/src/app/ts/AuditEvent.ts b/web/src/app/ts/AuditEvent.ts
index 089f468..18f91a0 100644
--- a/web/src/app/ts/AuditEvent.ts
+++ b/web/src/app/ts/AuditEvent.ts
@@ -56,6 +56,7 @@ export interface AuditEvent {
 	Id: number;
 	CreatedAt: string; // ISO string, can convert to Date if needed
 	User: number;
+	Username: string;
 	ResourceType: string; // Assuming this is a string enum or similar
 	ResourceId: number;
 	EventType: AuditEventType;