diff --git a/client/components/NetworkForm.vue b/client/components/NetworkForm.vue
index a071704f..a6735fdf 100644
--- a/client/components/NetworkForm.vue
+++ b/client/components/NetworkForm.vue
@@ -108,6 +108,7 @@
 						:value="defaults.nick"
 						maxlength="100"
 						required
+						@input="onNickChanged"
 					/>
 				</div>
 				<template v-if="!config.useHexIp">
@@ -117,6 +118,7 @@
 					<div class="col-sm-9">
 						<input
 							id="connect:username"
+							ref="usernameInput"
 							class="input username"
 							name="username"
 							:value="defaults.username"
@@ -211,9 +213,20 @@ export default {
 	data() {
 		return {
 			config: this.$store.state.serverConfiguration,
+			previousUsername: this.defaults.username,
 		};
 	},
 	methods: {
+		onNickChanged(event) {
+			if (
+				!this.$refs.usernameInput.value ||
+				this.$refs.usernameInput.value === this.previousUsername
+			) {
+				this.$refs.usernameInput.value = event.target.value;
+			}
+
+			this.previousUsername = event.target.value;
+		},
 		onSubmit(event) {
 			const formData = new FormData(event.target);
 			const data = {};
diff --git a/client/js/socket-events/configuration.js b/client/js/socket-events/configuration.js
index 0df9bfe4..2f7d19f5 100644
--- a/client/js/socket-events/configuration.js
+++ b/client/js/socket-events/configuration.js
@@ -46,33 +46,6 @@ socket.once("configuration", function(data) {
 		document.querySelector('meta[name="theme-color"]').content = currentTheme.themeColor;
 	}
 
-	// TODO: move to component (this mirrors the nick to the username field if the username is empty)
-	/* connect.on("show", function() {
-		connect
-			.html(templates.windows.connect(data))
-			.find("#connect\\:nick")
-			.on("focusin", function() {
-				// Need to set the first "lastvalue", so it can be used in the below function
-				const nick = $(this);
-				nick.data("lastvalue", nick.val());
-			})
-			.on("input", function() {
-				const nick = $(this).val();
-				const usernameInput = connect.find(".username");
-
-				// Because this gets called /after/ it has already changed, we need use the previous value
-				const lastValue = $(this).data("lastvalue");
-
-				// They were the same before the change, so update the username field
-				if (usernameInput.val() === lastValue) {
-					usernameInput.val(nick);
-				}
-
-				// Store the "previous" value, for next time
-				$(this).data("lastvalue", nick);
-			});
-	});*/
-
 	if ("URLSearchParams" in window) {
 		const params = new URLSearchParams(document.location.search);